Fix tests + Improve list command