minor refactor
KK full test suit