[BISERVER-10767] Backport of BISERVER-10767 - Fix unit tests so they will run; applied checkstyle
Merge pull request #1258 from webdetails/BISERVER_10767

[BISERVER-10767] Backport of BISERVER-10767 - Fix unit tests so they wil...