More repairing of tests