BISERVER-8044 fixing unit tests
Merge pull request #159 from rmansoor/master

BISERVER-8044 fixing unit tests
BISERVER-8044 - Fixing unit test
Merge pull request #160 from rmansoor/master

BISERVER-8044 - Fixing unit test
[BISERVER-8564] - Use Jersey friendly return types