Fix test settings so all non-acceptance tests run

Too many layers of indirection :(  This was causing all tests to be skipped, including non-selenium tests.