Ensure Around hooks are applied in the expected order
Fix a couple of tests that were brittle to scenario names