TestAnalyzis stage + improvements