Split marshalling tests from entity tests