Order test to have conflict

concurrency conflict test is ordered in such a way that a conflict must
occur.
Fix bug on popitem and add test for it