Fix test suite to run regardless of config setup.
More accurate config overriding for Zurich.