TDD cValidate complete

TDD when possible done