Change variable names
Remove duplicate tests