Added columns to steps and tests