Merge pull request #54 from claudius108/master

Improved some unit tests