Refactoring of Example + better tests