Fix tests with respect to 70bf0b3af7821773aa9bc964fef96c7323204bd1.
Add support for request ids (datamodel 0.4).