Fix failing unit tests (bad CASSANDRA-7744 merge)