Merge "Make AutoLoaderTest handle namespaces"