HH-43961 improve tests