Merge branch 'test_settings' into 'master'

added a base tests for settings

See merge request !1