If adjusting the expiration, also make sure it's not a duration
Mock noncer fixes tests