Issue #1607 Failed tests were fixed.