Adding additional tests. Closes #5.
Merge branch 'issue-5'