CORE-4446: added some more unit tests