Improved some unit tests.
Merge pull request #25 from claudius108/master

Improved some unit tests