Refactorings made and Acceptance Test