Minor refactor of unit tests

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

Minor refactor of unit tests