Add MySQL test fixes missed in last commit