[BUG #8507] Updated the marshaled tests (untested because the test runner does not work)