FLUID-5012, FLUID-5013: Created unit tests to re-produce the issues described in FLUID-5012 & FLUID-5013.