Expand issue-120 test cases