Fix tests affected by recursion bug