test fixes related to enum to varchar changes