Reorganized integrations tests