Added some more tests, switched to using self.assertEqual instead of just asserts