better test cleanup

and even force the XFAIL to fail as it would take too long anyway, even if it passes
fix tests on linux