diff --git a/app/helpers/tooltip_helper.rb b/app/helpers/tooltip_helper.rb
index 77db302..f409b97 100644
--- a/app/helpers/tooltip_helper.rb
+++ b/app/helpers/tooltip_helper.rb
@@ -5,4 +5,12 @@ module TooltipHelper
       concat tag.div(class: "tooltip-inner")
     end
   end
+
+  def get_approval_data_for_medical_release(medical_release)
+    if medical_release.approved_by_user_name.present?
+      "#{medical_release.approved_by_user_name} [#{medical_release.approved_by_user_email}]"
+    else
+      medical_release.approved_by_user_email
+    end
+  end
 end
diff --git a/app/models/medical_release.rb b/app/models/medical_release.rb
index c520d8e..996bfc5 100644
--- a/app/models/medical_release.rb
+++ b/app/models/medical_release.rb
@@ -105,7 +105,7 @@ class MedicalRelease < ApplicationRecord
 
     self.approved_by_user_name = user.full_name
     self.approved_by_user_email = user.email
-    self.approved_at = DateTime.now
+    self.approved_at = Time.zone.now
   end
 
   def approved?
diff --git a/app/views/medical_releases/_medical_release.html.erb b/app/views/medical_releases/_medical_release.html.erb
index 94a9c92..a598998 100644
--- a/app/views/medical_releases/_medical_release.html.erb
+++ b/app/views/medical_releases/_medical_release.html.erb
@@ -2,11 +2,7 @@
   <td data-behavior="select"><%= check_box_tag "medical_release_ids[]", medical_release.id, false %></td>
   <td class="text-center">
     <% if medical_release.approved? %>
-      <% if medical_release.approved_by_user_name.present? %>
-        <% tooltip_user_data = "#{medical_release.approved_by_user_name} [#{medical_release.approved_by_user_email}]" %>
-      <% else %>
-        <% tooltip_user_data = medical_release.approved_by_user_email %>
-      <% end %>
+      <% tooltip_user_data = get_approval_data_for_medical_release(medical_release) %>
       <i class="fa fa-check-circle fa-2x text-success"
          data-toggle="tooltip"
          title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: medical_release.approved_at %>"></i>
diff --git a/spec/controllers/medical_releases_controller_spec.rb b/spec/controllers/medical_releases_controller_spec.rb
index 7a5cc5b..e7dfa51 100644
--- a/spec/controllers/medical_releases_controller_spec.rb
+++ b/spec/controllers/medical_releases_controller_spec.rb
@@ -88,27 +88,4 @@ RSpec.describe MedicalReleasesController, type: :controller do
       }.to change(MedicalRelease, :count).by(-1)
     end
   end
-
-  describe "#review" do
-    let!(:medical_release) { create(:medical_release, project: project) }
-
-    it "responds successfully" do
-      get :review, params: { project_id: project, id: medical_release }
-
-      expect(response).to be_successful
-    end
-  end
-
-  describe "#approve" do
-    it "changes approval status successfully" do
-      medical_release = create(:medical_release, project: project)
-
-      expect(MedicalRelease.last.approved?).to eq false
-
-      patch :approve, params: { project_id: project, id: medical_release }
-
-      expect(response).to redirect_to [project, :medical_releases]
-      expect(MedicalRelease.last.approved?).to eq true
-    end
-  end
 end