Improve suite.pl