More work on issue #237 - get escalation/frequency working correctly
add more contagion tests