fix imports for serializer move
add more tests, fix bug with remove
Merge remote-tracking branch 'origin/cassandra' into cassandra