broken tests fixed for real