[BISERVER-10767] Fix unit tests so they will run