Tests repaired once more