fix live tests for organization, user fields