Fix a couple of tests that were brittle to scenario names