little more work on test data refactor