Add more to the test framework