Fix Concurrency feature and add more tests.