Updates to builder test and other shim tests.
renamed variable.