Add Marshal tests