fix and add tests
Merge pull request #25 from fjordllc/fix-tests

fix and add tests