added sortable columns
fixed test