renamed variables and tests