Refactor Organization integration tests