Default expiration timeout setting: 30 minutes.
Fixed some broken tests.