Disable server integrations correctly - was sending duplicates from Bundled integrations earlier
Consolidate for subprojects
Fix test cases