expedite-cxx: Fixed more tests.

No tests are crashing anymore.