Added some more tests and class no longer inherits test case