Refactoring PHPUnit testsuite.
Merge pull request #7 from wagnert/master

Refactoring PHPUnit testsuite.