added tests for gh-1606