rename command and add more tests