[BUGFIX] Fixes for testsuite