datagrid update / tests bug fixes