BISERVER-10280 fixing 2 more unit tests