Refactor renew tests