Added tests for pull request 6