broken tests fixed