diff --git a/.travis.yml b/.travis.yml
index da2bc743..846ec07e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - 10
   - 12
 env:
   - NODE_ENV=ci
diff --git a/bin/near-cli.js b/bin/near-cli.js
index 5042f962..42c78709 100644
--- a/bin/near-cli.js
+++ b/bin/near-cli.js
@@ -146,6 +146,7 @@ const clean = {
 
 let config = require('../get-config')();
 yargs // eslint-disable-line
+    .strict()
     .middleware(require('../utils/check-version'))
     .scriptName('near')
     .option('nodeUrl', {
@@ -170,6 +171,22 @@ yargs // eslint-disable-line
         desc: 'Unique identifier for the account',
         type: 'string',
     })
+
+    .option('walletUrl', {
+        desc: 'Website for NEAR Wallet',
+        type: 'string',
+        hidden: true
+    })
+    .option('contractName', {
+        desc: 'Account name of contract',
+        type: 'string',
+        hidden: true
+    })
+    .option('masterAccount', {
+        desc: 'Master account used when creating new accounts',
+        type: 'string',
+        hidden: true
+    })
     .middleware(require('../middleware/print-options'))
     .middleware(require('../middleware/key-store'))
     .command(require('../commands/create-account'))
@@ -198,6 +215,7 @@ yargs // eslint-disable-line
         'outDir': 'out_dir'
     })
     .showHelpOnFail(true)
+    .recommendCommands()
     .demandCommand(1, chalk`Pass {bold --help} to see all available commands and options.`)
     .usage(chalk`Usage: {bold $0 <command> [options]}`)
     .epilogue(chalk`Check out our epic whiteboard series: {bold http://near.ai/wbs}`)
diff --git a/test/test_account_operations.sh b/test/test_account_operations.sh
index 78639a2f..e24530a0 100755
--- a/test/test_account_operations.sh
+++ b/test/test_account_operations.sh
@@ -17,4 +17,4 @@ if [[ ! "$RESULT" =~ $EXPECTED ]]; then
     exit 1
 fi
 
-../bin/near delete_account $testaccount test.near
+../bin/near delete $testaccount test.near
diff --git a/test/test_generate_key.sh b/test/test_generate_key.sh
index 4a67a938..7e2c3217 100755
--- a/test/test_generate_key.sh
+++ b/test/test_generate_key.sh
@@ -1,10 +1,10 @@
 
 #!/bin/bash
 set -ex
-KEY_FILE=neardev/default/generate-key-test.json
+KEY_FILE=neardev/$NODE_ENV/generate-key-test.json
 rm -f "$KEY_FILE"
 
-RESULT=$(./bin/near generate-key generate-key-test --networkId default)
+RESULT=$(./bin/near generate-key generate-key-test --networkId $NODE_ENV)
 echo $RESULT
  
 if [[ ! -f "${KEY_FILE}" ]]; then
@@ -18,7 +18,7 @@ if [[ ! "$RESULT" =~ $EXPECTED ]]; then
     exit 1
 fi
 
-RESULT2=$(./bin/near generate-key generate-key-test --networkId default)
+RESULT2=$(./bin/near generate-key generate-key-test --networkId $NODE_ENV)
 echo $RESULT2
 
 EXPECTED2=".*Account has existing key pair with ed25519:.+ public key.*"