Added tests for commit 350088dd