Fix tests (some commuities allowed custom fields)