Cleaning up settings functional tests

ref #1702

- All the tests need cleaning up a bit, but these ones are failing
  regularly and I'd like to get to the bottom of it.