Change settings behavior after first review. Add tests.