Fixing some broken tests.