fix cmd definition
fix call to some functions in tests