Added test cases for marshalling / unmarshalling