Changed SimpleTest to test test framework