more work on the testing framework