test fixes related to enum to varchar changes
Merge pull request #2657 from kurund/test-fixes

test fixes related to enum to varchar changes