KHRES-328 #comment fix broken unit tests