some AnnieCliCommand fixes and add tests