Tidy unit test code

Signed-off-by: John Else <john.else@citrix.com>
Improve docs

Signed-off-by: John Else <john.else@citrix.com>