Completed autoloader with tests