Hotswap test improvement, still failing. Needs thought.