Update json marshaller and tests