Make #6924 test wait for schema agreement before querying with index

Also added a variant which drops the indexed columnfamily rather
than the entire keyspace