Issue #1604 several failed tests were fixed.