New Local Search and Test Refactoring - PART I - Almost there =)