Fixing the remaining broken tests.