Repaired some tests