update test for jenkins
update test for jenkins
update test for jenkins (more)
Merge branch 'staging' into gh-1080
Hopefully implements all of issue #1080