Fix the testsuite

Minor changes around to fix the testsuite