More work adding the column header columns and tests