apiVersion in Message
Expiry Date in Message and appropriate tests.