Updated commands and added test codes for it