BISERVER-10378 - Fixes for unit tests