Temporary fix for organization tests