CLI tests

Aruba, for real this time.

Basically, I tried to model the Scenarios after the flow that I could expect to happen - running through the InitGenerator code.

Feedback welcome!

Oh, and style updates. Duh.