Always set expiration time

Change-Id: I2c884d61530a1faa0a958465ed80c9db0e52b9e1
Fixed tests

Change-Id: Ic9a0425e44e3e2f0022c04f210b76f962ed4f6f6