Split vector test scopes to make it easier to add tests in between, refs rP20262.