BISERVER-8223- Fixed Unit tests