Fix AnalysisTest to use new infrastructure