Merge "Improve AutoLoader test coverage"