Fixed marshaller test