Added class autoloading
Fixing tests