Updated Autoloader.  Added Unit Test.