Merge "Add validaton tests for KNI"