Make tests consistant with new column structure