Some fixes to make the tests work
Finished renaming classes