add tests for organization/pid