Revert changes to the test suite in v9.9.13rc1 that would make the unit tests to fail

7 jobs for release-v9_9_13rc1 in 4 minutes and 26 seconds (queued for 5 seconds)