NH-2560 - Add additional test