Refactor unit tests for consistency

Signed-off-by: John Else <john.else@citrix.com>
Merge pull request #1128 from johnelse/unit-test-refactor-clearwater

CLEARWATER: Refactor unit tests for consistency