Refactor of Settings application and tests
Solve conflicts from pull request #376
Merge pull request #376 from owdqa/feature/OWD-32507-Refactor_Settings

Refactor of Settings application and tests