Fixing the broken tests