fix not passed tests, and handle concurrncy issues on user site