BISERVER-10923 - Fixing some unit tests