Issue #1573: Update tests