FLUID-4907: reorganized structure of tests