Fix a handful of unit test failures.
Review Request #9371 — Created Nov. 14, 2017 and submitted — Latest diff uploaded
The new kgb is a lot more strict when it comes to kwargs. This change
fixes up some test failures that were introduced by upgrading to it.
Ran unit tests.