Added tests to confirm pull request fix