Added more marshaling tests