Fix tests due to data API changes