Added test for Yid being passed in matching next Yid