fixed concurrency bug and added tests
removed erroneous comment