FLUID-5024: Update to tests