FLUID-4976: Fixed unit tests.