Add test for concurrent add /remove