Added support for ConstraintKinds

Also fixed the ConstraintKinds test case.