Autotesing improvement.

[DF - 291] Fix variable names.