BISERVER-11413 Unit tests