- refaktoring save() method and upgrade tests