Add test for HHH-8314