[HHH-8354]
added more tests