Follow X-GM-RAW "standard" better
Fix tests