Tests for Cassandra-7281
Merge pull request #118 from marcinszymaniuk/master

Tests for Cassandra-7281