Fix undeclared variable (following up on #108) and unit test bug.
Fix undeclared variable (following up on #108) and unit test bug.

HXLStandard/hxl-proxy,HXLStandard/hxl-proxy,HXLStandard/hxl-proxy,HXLStandard/hxl-proxy