Some more work on testing