Add OutPath argument + test