concurrency tests and tweaks