Add test and fix one more issue caught by test

Add unit test for concurrent incremental index add 
fix synchronization issue