Fix failing tests.

Refs GH-1307