The test setup here is not really independent, so the addition
of the custom-marshaller test was breaking some of the other
tests. Fix things up.