Fix for tests under cassandra
Fix test imports
Fix test imports