Updated PHPunit config
Updated Travis config
Changed Testing version
Merge pull request #88 from WouterJ/testing-patch

Update to Testing changes