Refactoring : Unit Test and code to take in account previous refactoring.