Fixing the failing tests.

#4970