add column support, update tests