Unbundle PHPUnit, closes #1158