Fixing all broken tests