Fix test
Remove unnecessary import in unit tests
Update Settings UI