US21-add to validate class method ...

Code review - updating unit tests