Add validation checking for itf and update unit test