Give Test Refactor 2