Improve marshal tests.