Improve variable names in tests.