Add test cases for parsing multiple fields of the same oneof from the wire
Add more tests for submessage merging, including oneofs