FLUID-4824: Small fixes; fixes to some tests