FLUID-5433: Updated unit tests.