More cleaning of Registry test files and suites.