Testsuite fixes for Jenkins