Concurrency

fixing tests