Both of those tests started failing when we moved the data to a single column family. Both of them are failing because we report "wrong" storageSize(). When data is in a single column family it's a bit harder to report storageSize(), especially when bunch of bytes are in the write-ahead-log.

I'm fixing those tests by changing what we return in storageSize() to make tests happy. We could also make the changes to the tests.