Fixing broken tests.