Refactoring : Tests enhancement.