Give each cli its own test.

This will give a nicer failure message, and results in 3
slowish tests instead of 1 really slow one.

Change-Id: I5c3fbd2507068908c165e163b8f458bf8cb00bc1
Merge "Give each cli its own test."