properly build mocks with current phpunit to avoid problems with constructor
Merge pull request #199 from jackalope/cleanup-tests

properly build mocks with current phpunit to avoid problems with constructor