Updated tests to extend "TestCase"