commit/validate organization and some tests