refactored all tests by using more verbose variable names