fix: tests and new data model for cassandra