fixup! fixup! further test run speed improvements