1153 Move column name to a constant and fix test