Added tests for NH-3527.