TRIVIAL more tests and fixes
TRIVIAL more commandline stuff