Fast broken tests fix