Make variable names more accurate in test