Merged custom_columns_regress into the custom_columns test package.