renamed column for columns and rewrite some tests