Small improvements.
Test improvements for the expiration one. Lets see if it passes on
Drone.