Clean up ColumnType, bugfixes and tests added