Change tests according to the changes made in src