Added more tests for commit 350088dd

Completes CLT-338.