Merge pull request #47 from leftclickben/master

Unit test improvements.