#718 - Fix failing tests.