BISERVER-8811 - Fixing unit tests