FLUID-4907: fixed up tests after merge