rename some variables in tests