Validator issues.
Added some JUnits.