KFSUPGRADE-1006 : split test and add comments