FLUID-5036: Reworked test cases for this issue so they are valid, as well as resolving faulty diagnostic from the framework
Merge remote-tracking branch 'amb26/FLUID-5036'

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