diff --git a/FUTURE b/FUTURE
index 65f57e88d485e71913f989236b3adf7feeb2d015..919c7c3f9b7cc703c66201a7d2d934e529b22399 100644
--- a/FUTURE
+++ b/FUTURE
@@ -4,7 +4,7 @@ Let me know what is important to you!
 
 Read wadl file from bluecat server, and use it to:
 - take arguments without the names
-- figure out the http method automatically
+- figure out the http method automatically (partly done)
 - Handle start and count automatically
 Together, instead of:
  ./bam.py getEntities method=get parentId=13098279 type=HostRecord start=0 count=99999
@@ -28,5 +28,5 @@ Select what fields to output, instead of whole objects, if desired
 
 Add common tasks that map to several API calls, like getting a DNS record by FQDN
 
-Sort dictionary items, either alphabetically,
-or in an order that makes sense for BlueCat entities.
+Sort dictionary items so that output is in a consistent order,
+either alphabetically, or in an order that makes sense for BlueCat entities.
diff --git a/README.md b/README.md
index 4e727a493d58086afd8ef40ba64de0d54795f5ed..7fb48c7c2e9d7cf539bf967287136293720a4b80 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Use as a Python module like:
 import json
 import bluecat_bam
 with BAM(server, username, password) as conn:
-    r = conn.do('getEntityByName', method='get', parentId=0, name='admin', type='User')
+    r = conn.do('getEntityByName', parentId=0, name='admin', type='User')
     print(json.dumps(r))
 ```
 Sample output:
@@ -29,13 +29,15 @@ Sample output:
 
 Or use on the command line as a CLI, putting the setup in the environment:
 ```
-cat > mybluecat.env <<EOF
+touch mybluecat.env
+chmod 700 mybluecat.env
+cat >> mybluecat.env <<EOF
 export BLUECAT_SERVER=bluecatservername.domain.example
 export BLUECAT_USERNAME=myusername
 export BLUECAT_PASSWORD=mypassword
 EOF
 source mybluecat.env
-bam getEntityByName method=get parentId=0 name=admin type=User
+bam getEntityByName parentId=0 name=admin type=User
 ```
 Sample output:
 ```
@@ -50,7 +52,7 @@ environment variables.  See help:
 bam -h
 ```
 
-Output can be any of:
+Output from an API call can be any of:
 - JSON dictionary (usually an entity)
 - JSON list of dictionaries (like a list of entities)
 - JSON string (in quotes)
@@ -76,23 +78,30 @@ pip install setuptools
 ## Normal Installation ##
 Download with git as shown, or with curl or wget or web browser
 ```
-git clone git@gitlab.umich.edu:rharolde/bluecat_rest_api_python2.git
+git clone git@gitlab.umich.edu:its-public/bluecat_bam.git
 cd bluecat_rest_api_python2
 pip install .
 ```
 If installed as a user, you might need to add "~/.local/bin" to your PATH
 
-## Dev Installation ##
+## Dev Installation in virtualenv ##
 ```
-git clone git@gitlab.umich.edu:rharolde/bluecat_rest_api_python2.git
+git clone git@gitlab.umich.edu:its-public/bluecat_bam.git
 cd bluecat_rest_api_python2
 virtualenv venv -p python2
 source ./venv/bin/activate
-pip install --upgrade -e .
+pip install ".[test]"
 ```
+
 If installed as a user, you might need to add "~/.local/bin" to your PATH
 
-Written to run under both Python2 and Python3, since the BAM (v8.3.2) has only Python2.  
+See "samples" directory, and also try running quicktest.sh
+.gitlab-ci.yml assumes a gitlab repo, will be different on github.
+
+Written to run under both Python2 and Python3, since the BAM (v9.1.0 and before)
+defaults to Python2.  (BAM 8.2.0 has only Python2)
 Using 'black' to enforce format, line width 88.  
 This passes pylint and flake8 with minor exceptions, see .pylintrc and .flake8  
 Also passes "bandit" security linter.  
+
+See FUTURE for plans to improve this.
diff --git a/samples/getsysteminfo.py b/samples/getsysteminfo.py
index 5d3bd42aa68673972ce83af8e1e199e4246b4cc7..11999019b194aab06cdcd27c74ef92a8d7cf163c 100755
--- a/samples/getsysteminfo.py
+++ b/samples/getsysteminfo.py
@@ -49,5 +49,6 @@ logger.setLevel(args.logging)
 
 opts = {"timeout": None, "max_retries": 0}
 with bluecat_bam.BAM(args.server, args.username, args.password, **opts) as conn:
-    info = conn.do("getSystemInfo", method="get")
+    # info = conn.do("getSystemInfo", method="get")
+    info = conn.do("getSystemInfo")
     print(json.dumps(info))
diff --git a/samples/wadl2methodlist.py b/samples/wadl2methodlist.py
old mode 100644
new mode 100755
diff --git a/setup.py b/setup.py
index 8a8fddf2c2b0b886f39fb680ca7ac0cec60ab7fa..18e64d6774faada8a6c1f5d70846f7cd9795a250 100644
--- a/setup.py
+++ b/setup.py
@@ -8,6 +8,19 @@ version_file_path = os.path.join(os.path.dirname(__file__), "src", name, "VERSIO
 with open(version_file_path) as version_file:
     _version = version_file.read().strip()
 
+tests_require = (
+    [
+        "pytest",
+        "pytest_mock",
+        "requests_mock",
+        "flake8",
+        "bandit",
+        "pylint",
+        "black",
+        "xmltodict",
+    ],
+)
+
 setup(
     name=name,
     version=_version,
@@ -16,7 +29,8 @@ setup(
     include_package_data=True,
     zip_safe=False,
     setup_requires=["pytest-runner"],
-    tests_require=["pytest", "pytest_mock", "requests_mock"],
+    tests_require=tests_require,
+    extras_require={"test": tests_require},
     install_requires=["requests==2.21.0"],
     entry_points={"console_scripts": ["bam=bluecat_bam.cli:main"]},
 )