Restructure match-by-file-ext block; rework two tests to be 'more specific'