Reviewed-by: alanb, dsamersoff

Summary: Don't execute useless code, and split test into multiple @runs.
Reviewed-by: tbell