Couple refinements to test launch speedups