BISERVER-8088 - Fixing unit tests
Merge pull request #18 from brosander/BISERVER-8088

BISERVER-8088 - Fixing unit tests