Some test speed tweaks.