rewrite all tests
Merge pull request #34 from canarymason/tests

rewrite all tests