Fix casting issue
Test marshal then unmarshal