Merge "Normalize dir path in AutoLoaderStructureTest"