Move test-specific settings into the tests.

* The 'with' statement allows us to put settings for a
  particular test into the specific test depending on
  them.  This is much better and cleaner than doing it
  in run.py.