Issue #1651: Add a test
Fix #1651
Issue #1651: Bulk update tests