Changes to make CLI consistent with automated testing script