cleanup and standardize ES/Cassandra tests
Merge pull request #51 from dieswaytoofast/develop

cleanup and standardize ES/Cassandra tests