Revert test data changes causing new failures