CORE-5216: added some more unit tests