more work on new test stuff