Fiddled with the test framework