[Tests] Repaired broken tests