Added columns to Tasks and modified tests