Added expiration to base wrapper and updated test