TST: fix test_reshape.py

Fixes #6081 issues in test_reshape.py -- most of `test_custom_var_and_value_name` wasn't being executed (hiding some bugs in the test code too) because it was being shadowed by another method of the same name.