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