Improve CQL3 test cases.