fix few bugs and add more tests for new cassandra backend
Merge remote-tracking branch 'origin/master'