Add organization id and test