Ref #718 - Fix broken tests.