Completed PHPUnit integration features (for now at least)
Merge remote-tracking branch 'origin/master'