Merge "test classes autoloading path was broken"