Added Anton's fixes from other branch.
Fixed 1 problem in bok-choy tests.