Fix code formatting and add test case for null check in uniqueness validator.
Merge branch 'uniqueness_null_check'