more work on the testing infrastructure