fixed some broken tests.