fixed concurrency, added plural tests
Merge pull request #1 from mashpie/master

fixed