Repair tests for latest changes