fix up tests
clean ups
merge it
deps
Merge pull request #5 from calvinmetcalf/fixes

fix tests, clean up a few things