fixed up some broken tests