Fix test failures.

Fix test failures related to ViewVarsTrait.
Remove stupid parameter names.