more fixes to testsuite by Cristian and vda

3 files changed