Fix the rest of the concurrency problems
remove all the test cases
fix attachment content