Refactored add organization test to be a little cleaner.