Add bactch test and rename like in cql-io.