Some more work on concurrent testcases.