KFSUPGRADE-999 making unit test more efficient