2.008 - fix test because of external errors. Small enhancements for analyze.pl