Fix tests and test data.