Add (slightly) more sophisticated command line tests