Fix tests after modifications