fixed 12 broken tests