Fix test data changes causing new failures