Fix infinite recursion

Fixes infinite recursion in the unit tests now that 6.1 GM seed 2 is out and fixes the issues that were crashing us.