Fix expiration tests