Some tweaks to testsuites.
Merge pull request #69 from tony/testsuite-refactor

Some tweaks to testsuites.