Add two more tests for organization