Change tests to reflect recent wording changes.
Minor release cleanups