Some tweaks to testsuites.