Add unit tests for #57
Merge pull request #59 from starberry/oops

Add unit tests for #57