Remove validator null checks
Fix unit test with null check removal