"Fix" tests based on local var shadowing

See issue #13.