A few fixups and refactored the tests for the new classes