|#729| +ManAn| Reducing build time. Adding Categories IntegrationTests and UnitTests