Repair unit tests