fixed edit with new columns and tests for it