Give Test Refactor