more validators and unit tests