Refactor unit tests for consistency

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

Refactor unit tests for consistency