Fixed the broken tests