added tests, removed old autoloader