Improve command help
Add list unit tests