Add test and fix one more issue caught by test
Merge pull request #414 from metamx/incremental-index-synchronization-fix

Add test and fix one more issue caught by test