Added cli
9 was not recognized, added tests