refactor batch test
Merge branch '1.0' of https://github.com/datastax/cpp-driver into 1.0