Add tests for all protocol request/response types.
Fix merge conflicts... no idea how that one happened :-)