removed "todo" and added test for issue #622
Merge pull request #662 from svarovski/issue-622

#662: pull request removed "todo" and added test for issue #622