Fixes for shadowed locals shown by tests script.