Refactoring, now using three Tests