Add unit tests for PR #31
Merge pull request #32 from ModelN/pr/31

Add unit tests for PR #31