Add tests for CASSANDRA-8101

Enable test for CASSANDRA-8101
Merge branch '8101-continued'