more test data fixes