test fixes in Marshall