Chg: cleaned a bit the testsuite