update existing tests and add a new test for CASSANDRA-16983