Add Organization factory for UI

Create a factory to create organizations for UI
Update tests to use the factory to create required organization

Related to issue #490