test fixes.
midway commit