fixed autoloader and test