Testsuite cleanups

Here are the two testsuite patches. I dropped the cube2hash fix, as we discussed.