Fix a duplicated variable, and defeat some warnings in fish_tests