CQL tests: cleanups and index test