add organization validation and test code.