BISERVER-8044 fixing unit tests