update the tests to be more parameterized.

There is an issue with bulk indexing, it's not executing reliably.
I added some more wait, but that didn't work. I will have to
read and understand this code before I can fix it.