Merge pull request #4 from invisiblefriend/develop

Rewrote tests to make them more useful and robust