Test Refactor, let tests