Address comments and fix bok-choy tests.