Adjusting variable names in test base.