Fix tests following change to test data