Bugfixes in ColumnFamily; test organization.
Now moving on to an interesting error.