Improving tests related to marshalling