Add tests for CASSANDRA-8451
Merge branch 'CASSANDRA-8451'