Improve user tests
Add settings spec