Unit tests work now
Merge pull request #5 from xcthulhu/develop

Unit tests work now