cleanup, tests running, fixed autoload