Update and test JSON marshalling