Add input file tasks. Update tests