Merge "Move several unit tests to directly subclass PHPUnit_Framework_TestCase"