** Changed mock session id to be more informative
** Added test for partly matching conflict