PHPUnit 4.x compatibility fixes
Merge pull request #84 from aik099/phpunit4-compatibility-fix

PHPUnit 4.x compatibility fixes