Fix test overwriting
Add zipped file switch
Add zip file switch to results command