Some bug fixes: 1. ShMemServer: increment fork_id_cur after copying over the senders argument.2. ShMemObject: leaves weren't merging in properly.3. ShMemObject.json2shmem: using the wrong object to extract values from.Also changed the simple test files so that they are compatible with the new diffing version.