Adding date, properties and keys and tests