Reduce unneeded test code

-Another tweak to attempt to fix the intermittent test