Merge "Improve SessionTest to better detect possible Recursion cases"