CORE-4446: added a few more test cases