Some preps for multi backend tests
Removed handoff concurrency change.