Add test to ensure that NH-2439 is fixed