further test run speed improvements
fixup! further test run speed improvements