More unit tests.
Merge pull request #26 from leftclickben/master

More unit tests.