Satisfy test suite and CLI