FLUID-4794: refactored tests.

Refactored the progressive enhancement tests to remove duplicate assertion code.