Rework scenarios to use correct addresses and tags