Fix (most) Bok Choy tests