unit tests work
Merge pull request #1 from McFaceDude/master

unit tests work