All tests pass with incremental updates. Refactoring complete.