After Second Test Refactor