Prevent variable leakage
Merge pull request #1 from 4z3/master

Prevent variable leakage in test suite