Fix clargs test; also make testing more flexible.