Add forgotten test
Merge branch 'cassandra-1.2' into cassandra-2.0
Add forgotten test
Merge branch 'cassandra-2.0' into cassandra-2.1