KFSUPGRADE-1002 Add more unit tests