All test pass, re-implementation of CLI logic.