Repaired all tests