More tests repaired