Implemented correct file saving and removed C-ECHO test