fixing some of the broken tests