Misc fixes

-Refactor class names
-Fixes for failing tests