Added --file-list flag + tests