Add more-extensive command line option testing