Fixed most of the broken tests