cleanup and new test for AutoLoad