Tests should be updated, but at the same time the containing script needs review. Putting this off until tests are overhauled after v3.1.0