Updated tests for organizations.
Tried to make tests more flexible for not new databases.