Chg: cleaned a few tests (there are still things to be done...)