I just merged my PR for PHP-FPM tests that greatly simplifies all tests in FPM and fixes existing failing tests.