Feature/analysis results test and fix