Fixing the tests.

#3316