Bugfixing PHPUnit tests
Merge pull request #6 from wagnert/master

Bugfixing PHPUnit tests