Fixes for marshalling rqeuest data for tests