Fixing setting tests
Fixing Settings page tests