Fixed unit tests
Merge pull request #3 from barrywark/master

unitests