Add some tests for check marshalling