Fixed a couple of failing tests from issue #1089.

Fixed a couple of failing tests from issue #1089.