Fix the broken tests