Improve testUpdateByQuery_multipleIndices a bit
Fix testUpdateByQuery_usingAliases when randomization would take 1 single shard
Fix race condition causing too many responses to be collected - closes #22