Fix test concurrency issue, take three