phpunit 4.x upgrade
Merge pull request #156 from formapro-forks/phpunit40

phpunit 4.x upgrade