Fix the cli params and cover with molecule tests. Change-Id: If396fad27c5ca7668b1741695bd4968997ee5017