Fixed some broken tests.