Split out general tests from feature-specific
Add filetype filtering