Merge "Added concurrency test"