Settings may work.
Removed update picker.
New tests in place.