Enable multi-org for hammer tests, allow hammer-tests override