Add basic metadata request support.
Slightly update test cases to reflect new protocol.