test: refactoring: renamed variables & functions
test: refactoring: fixed: missing search & replace instances