Rename some variables in tests