Issue 717 tests