Fix syntax (extraneous comma), update to a known PHPUnit version (3.6 is now defunct)