Some more work on the testing process