Fix tests according to changes made