KFSUPGRADE-999 FP Unit Tests