Fix infinite reload loop running tests

(just a guess at the fix; arbesfeld to fix the fix if necessary)
Fix the fix to the infinite reload loop

…after talking to arbesfeld