Changed OrganizationTest and index to use graph->resource function