Merge pull request #222 from zmughal/test-fix-from-pr-214