Merged PR #28 Fix unit tests

Closes #10