Fix test failures caused by previous changes.

BB-153