Refactoring: renamed few variables in test