Unbundle PHPUnit, closes #1070