fix concurrency tests both for local and remote