Class logic fixes
Several loader tests