Refactored file parsing + tests