More tests!
Merge pull request #126 from xdothackerx/tests

More tests!