Fixing unit tests and checking for null validator.