Added unit test for issue HHH-9199
Added unit test for issue HHH-9199