diff --git a/test/models/certificate_test.rb b/test/models/certificate_test.rb
new file mode 100644
index 000000000..a48c6081f
--- /dev/null
+++ b/test/models/certificate_test.rb
@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class CertificateTest < ActiveSupport::TestCase
+  setup do
+    @certificate = certificates(:api)
+    @certificate.update!(csr: "-----BEGIN CERTIFICATE REQUEST-----\nMIICszCCAZsCAQAwbjELMAkGA1UEBhMCRUUxFDASBgNVBAMMC2ZyZXNoYm94LmVl\nMRAwDgYDVQQHDAdUYWxsaW5uMREwDwYDVQQKDAhGcmVzaGJveDERMA8GA1UECAwI\nSGFyanVtYWExETAPBgNVBAsMCEZyZXNoYm94MIIBIjANBgkqhkiG9w0BAQEFAAOC\nAQ8AMIIBCgKCAQEA1VVESynZoZhIbe8s9zHkELZ/ZDCGiM2Q8IIGb1IOieT5U2mx\nIsVXz85USYsSQY9+4YdEXnupq9fShArT8pstS/VN6BnxdfAiYXc3UWWAuaYAdNGJ\nDr5Jf6uMt1wVnCgoDL7eJq9tWMwARC/viT81o92fgqHFHW0wEolfCmnpik9o0ACD\nFiWZ9IBIevmFqXtq25v9CY2cT9+eZW127WtJmOY/PKJhzh0QaEYHqXTHWOLZWpnp\nHH4elyJ2CrFulOZbHPkPNB9Nf4XQjzk1ffoH6e5IVys2VV5xwcTkF0jY5XTROVxX\nlR2FWqic8Q2pIhSks48+J6o1GtXGnTxv94lSDwIDAQABoAAwDQYJKoZIhvcNAQEL\nBQADggEBAEFcYmQvcAC8773eRTWBJJNoA4kRgoXDMYiiEHih5iJPVSxfidRwYDTF\nsP+ttNTUg3JocFHY75kuM9T2USh+gu/trRF0o4WWa+AbK3JbbdjdT1xOMn7XtfUU\nZ/f1XCS9YdHQFCA6nk4Z+TLWwYsgk7n490AQOiB213fa1UIe83qIfw/3GRqRUZ7U\nwIWEGsHED5WT69GyxjyKHcqGoV7uFnqFN0sQVKVTy/NFRVQvtBUspCbsOirdDRie\nAB2KbGHL+t1QrRF10szwCJDyk5aYlVhxvdI8zn010nrxHkiyQpDFFldDMLJl10BW\n2w9PGO061z+tntdRcKQGuEpnIr9U5Vs=\n-----END CERTIFICATE REQUEST-----\n")
+  end
+
+  def test_does_metadata_is_api
+    api = @certificate.assign_metadata
+    assert api, 'api'
+  end
+
+  def test_certificate_sign_returns_false
+    assert_not @certificate.sign!, 'false'
+  end
+end
\ No newline at end of file
diff --git a/test/models/domain_contact_test.rb b/test/models/domain_contact_test.rb
new file mode 100644
index 000000000..4bfefb7f1
--- /dev/null
+++ b/test/models/domain_contact_test.rb
@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class DomainContactTest < ActiveSupport::TestCase
+  setup do
+    @domain_contact = domain_contacts(:shop_jane)
+  end
+
+  def test_if_domain_contact_type_invalid
+    @domain_contact.update(type: "Some")
+    assert @domain_contact.name, ''
+  end
+
+  def test_value_typeahead
+    assert @domain_contact.value_typeahead, 'Jane'
+  end
+
+end
\ No newline at end of file
diff --git a/test/system/admin_area/contacts_test.rb b/test/system/admin_area/contacts_test.rb
index 19b15c8a5..92b0a064b 100644
--- a/test/system/admin_area/contacts_test.rb
+++ b/test/system/admin_area/contacts_test.rb
@@ -9,7 +9,7 @@ class AdminContactsTest < ApplicationSystemTestCase
   end
 
   def test_update_contact
-    visit admin_contact_path(id: @contact.id)
+    visit admin_contact_path(@contact.id)
     assert_text "#{@contact.name}"
 
     click_on 'Edit statuses'