Fix ColumnLayout unit tests