KFSUPGRADE-1004 better test, need to fix some hard coding