testsuite adapted to latest changes