FLUID-4824: Tests mostly passing (in FF)