Added Anton's changes from other branch.
Fixed bok-choy tests.