Refactoring still works great without touching the test cases