[#32] Refactored before_save to some smaller methods
[#32] Deleted unnecessary assigment in test