fixed autoloading and testing integration