Adding more test files and filters