Adding meaningful constant expirations
Updating tests to use constants