Explicit Tests Tell a Better Tale

Refactoring