Refactor method names and test variables

Refactored multiple method names and test variables for better
readability.