Fix all broken tests