BISERVER-8345 - Fixed some unit test failures