Better testing for PhpUnit parameters
Merge remote-tracking branch 'origin/master'