US21-add to validate class method to verify ...

Code review - updating unit test