updated autoload classmap
CS fixes
more tests