Merge "format the tests/phpunit/TODO document for readability"