Minor refactoring to make PHPUnit tests work
Merge pull request #1 from wagnert/master

Minor refactoring to make PHPUnit tests work