Refactoring: DefaultValuesFactory cleaning
(factoryrefactory)
+test coverage