Cleanup tests to be more independent of distribution type.