HHH-8285 Adding more tests