Using a combined approach appears to work at least once, but test hangs on second control transfer.