Added the option of including a expiration pushed via a stream and
tests.