Added new test cases for PR #16