Cleaned up tests to use unit test framework