Adhering to standards
Fixing failed tests
Making the tests compatible with Tom's code (not yet fixed working copy)
fixing tests