Tests for CASSANDRA-8087
Merge remote-tracking branch 'thobbs/CASSANDRA-8087'