Tests for NH3641
Fix for NH3641