Support multiple file patterns
More TODOs
Refactor tests