french cleanup, testing excludes