[Configuration] Fixed last changes to pass the tests