fixing some broken tests