[ANALYZER-2248] - Changed test definitions to match new build process