fixed some broken tests