Composite and Test-Driven Refactoring's