Refactoring changes and Language configuration test