Add map test cases for Marshal
Add a couple of test cases for the Marshaler interface