Had to strip out some JSPB-format test code, but also added some .proto test messages that had been improperly stripped out.