Update cli tests and plans scripts