Changed to correct file parameters and updated test