BISERVER-8088 - Fixing unit tests