Fix add/list/remove command
Add more command test