Added settings.yml for running tests
Merge branch 'development'