FLUID-5036: Reworked test cases for this issue so they are valid, as well as resolving faulty diagnostic from the framework