Deursen, Marin, Moonen, 2005. A Systematic Aspect-Oriented Refactoring and Testing Strategy, and its Application to JHotDraw.