(Issue 696) Migrate queries to CQL3
(CQL3) Fix unit test failure
Merge pull request #696 from mrvisser/issue-696

Upgrade to CQL3