re-enabling and fixing column tests