add File keyword and new test file
fix clean filter to fit new File keyword
fix clean filter
fix clean filter issue