First cassandra integration test and some refactors