Added cli and test