Updated broken tests