Merge "Tests for set Organization Info" into nyc-dev