Update MockBase to support column families
Update unit tests to handle MockBase column families