Change tests according to func changes