Fixing some test brokenness.