cleanup and standardize ES/Cassandra tests