test data improvements