Added unit test for issue HHH-8769