Rejigger some shii
Add cassandra tests