Minor changes to fix CLI testing with Mocha