Fix test variable names