BISERVER-10280 Fixing 2 more unit tests