fixed all broken tests