Refactor for test deploy.