extending cli help, cli useability/unification and added autotest command