CDB-2891 Fixes tests related to changes in organizations and user creation