benching/testing fixes:

155036 +- 5797 (149239  - 160833)