fix tests to require "units"
Merge branch '8.34'
fix tests to require "units" consistently