removed optimizations for cass and added a couple more tests