More clean ups and Bok Choy test fixes
More test fixes.
Yet more test fixes.