Renaming some test variables for simplicity