FLUID-4908: Fixed the unit tests.