Use the new test vars.
Merge pull request #97 from greboid/master

Use the new test vars.