Fixed up broken tests