diff --git a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
index 282a83a8f0..2ebcb80c35 100644
--- a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
+++ b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
@@ -5,13 +5,17 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.openelisglobal.BaseWebContextSensitiveTest;
+import org.openelisglobal.common.util.SystemConfiguration;
 import org.openelisglobal.patient.service.PatientService;
+import org.openelisglobal.patient.service.PatientTypeService;
 import org.openelisglobal.patient.valueholder.Patient;
+import org.openelisglobal.patienttype.valueholder.PatientType;
 import org.openelisglobal.person.service.PersonService;
 import org.openelisglobal.person.valueholder.Person;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +25,9 @@ public class PatientServiceTest extends BaseWebContextSensitiveTest {
     @Autowired
     PatientService patientService;
 
+    @Autowired
+    PatientTypeService patientTypeService;
+
     @Autowired
     PersonService personService;
 
@@ -28,12 +35,14 @@ public class PatientServiceTest extends BaseWebContextSensitiveTest {
     public void init() throws Exception {
         patientService.deleteAll(patientService.getAll());
         personService.deleteAll(personService.getAll());
+        patientTypeService.deleteAll(patientTypeService.getAll());
     }
 
     @After
     public void tearDown() {
         patientService.deleteAll(patientService.getAll());
         personService.deleteAll(personService.getAll());
+        patientTypeService.deleteAll(patientTypeService.getAll());
     }
 
     @Test
@@ -45,7 +54,7 @@ public void createPatient_shouldCreateNewPatient() throws Exception {
         Patient pat = createPatient(firstName, lastname, dob, gender);
 
         Assert.assertEquals(0, patientService.getAllPatients().size());
-        // save patient to the DB
+
         String patientId = patientService.insert(pat);
         Patient savedPatient = patientService.get(patientId);
 
@@ -85,4 +94,200 @@ private Patient createPatient(String firstName, String LastName, String birthDat
 
         return pat;
     }
+
+    @Test
+    public void updatePatient_shouldUpdateExistingPatient() throws Exception {
+        String firstName = "Alice";
+        String lastName = "Johnson";
+        String dob = "15/05/1985";
+        String gender = "F";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+
+        String patientId = patientService.insert(pat);
+
+        Patient savedPatient = patientService.get(patientId);
+        savedPatient.getPerson().setFirstName("Alicia");
+        savedPatient.setGender("F");
+
+        personService.save(savedPatient.getPerson());
+
+        patientService.update(savedPatient);
+
+        Patient updatedPatient = patientService.get(patientId);
+        Assert.assertEquals("Alicia", updatedPatient.getPerson().getFirstName());
+        Assert.assertEquals("F", updatedPatient.getGender());
+    }
+
+    @Test
+    public void deletePatient_shouldRemovePatient() throws Exception {
+        String firstName = "Bob";
+        String lastName = "Marley";
+        String dob = "06/02/1945";
+        String gender = "M";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+
+        Assert.assertEquals(0, patientService.getAllPatients().size());
+
+        String patientId = patientService.insert(pat);
+        Assert.assertNotNull(patientId);
+
+        Patient savedPatient = patientService.get(patientId);
+        Assert.assertNotNull(savedPatient);
+
+        patientService.delete(savedPatient);
+
+        Assert.assertEquals(0, patientService.getAllPatients().size());
+    }
+
+    @Test
+    public void createPatientType_shouldCreateNewPatientType() throws Exception {
+        PatientType patientType = new PatientType();
+        patientType.setDescription("Test Type");
+
+        Assert.assertEquals(0, patientTypeService.getAllPatientTypes().size());
+
+        String patientTypeId = patientTypeService.insert(patientType);
+        PatientType savedPatientType = patientTypeService.get(patientTypeId);
+
+        Assert.assertEquals(1, patientTypeService.getAllPatientTypes().size());
+        Assert.assertEquals("Test Type", savedPatientType.getDescription());
+    }
+
+    @Test
+    public void getPatientByNationalId_shouldReturnCorrectPatient() throws Exception {
+        String firstName = "Bruce";
+        String lastName = "Wayne";
+        String dob = "10/10/1975";
+        String gender = "M";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+        pat.setNationalId("12345");
+
+        String patientId = patientService.insert(pat);
+
+        Patient fetchedPatient = patientService.getPatientByNationalId("12345");
+
+        Assert.assertNotNull(fetchedPatient);
+        Assert.assertEquals(patientId, fetchedPatient.getId());
+    }
+
+    @Test
+    public void getPatientByExternalId_shouldReturnCorrectPatient() throws Exception {
+        String firstName = "Oliver";
+        String lastName = "Queen";
+        String dob = "27/09/1985";
+        String gender = "M";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+        pat.setExternalId("EX123");
+
+        String patientId = patientService.insert(pat);
+
+        Patient fetchedPatient = patientService.getPatientByExternalId("EX123");
+
+        Assert.assertNotNull(fetchedPatient);
+        Assert.assertEquals(patientId, fetchedPatient.getId());
+    }
+
+    @Test
+    public void getFirstName_shouldReturnCorrectFirstName() throws Exception {
+        String firstName = "Tony";
+        String lastName = "Stark";
+        String dob = "10/05/1970";
+        String gender = "M";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+
+        String patientId = patientService.insert(pat);
+
+        String fetchedFirstName = patientService.getFirstName(pat);
+
+        Assert.assertEquals(firstName, fetchedFirstName);
+    }
+
+    @Test
+    public void getLastName_shouldReturnCorrectLastName() throws Exception {
+        String firstName = "Natasha";
+        String lastName = "Romanoff";
+        String dob = "03/12/1985";
+        String gender = "F";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+
+        String patientId = patientService.insert(pat);
+
+        String fetchedLastName = patientService.getLastName(pat);
+
+        Assert.assertEquals(lastName, fetchedLastName);
+    }
+
+    @Test
+    public void getLastFirstName_shouldReturnCorrectLastFirstName() throws Exception {
+        String firstName = "Steve";
+        String lastName = "Rogers";
+        String dob = "04/07/1920";
+        String gender = "M";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+
+        String patientId = patientService.insert(pat);
+
+        String lastFirstName = patientService.getLastFirstName(pat);
+
+        Assert.assertEquals(lastName + ", " + firstName, lastFirstName);
+    }
+
+    @Test
+    public void getGender_shouldReturnCorrectGender() throws Exception {
+        String firstName = "Derrick";
+        String lastName = "Junior";
+        String dob = "13/02/1989";
+        String gender = "F";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+
+        String patientId = patientService.insert(pat);
+
+        String fetchedGender = patientService.getGender(pat);
+
+        Assert.assertEquals(gender, fetchedGender);
+    }
+
+    @Test
+    public void getLocalizedGender_shouldReturnCorrectLocalizedGender() throws Exception {
+        String firstName = "Tayebwa";
+        String lastName = "Noah";
+        String dob = "01/01/2020";
+        String gender = "M";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+
+        String patientId = patientService.insert(pat);
+
+        String localizedGender = patientService.getLocalizedGender(pat);
+
+        Assert.assertEquals("MALE", localizedGender);
+    }
+
+    @Test
+    public void getPageOfPatients_shouldReturnCorrectPatients() throws Exception {
+        String firstName1 = "Josh";
+        String lastName1 = "Nsereko";
+        String dob1 = "20/03/1980";
+        String gender1 = "M";
+        Patient pat1 = createPatient(firstName1, lastName1, dob1, gender1);
+
+        String firstName2 = "John";
+        String lastName2 = "Stewart";
+        String dob2 = "22/04/1982";
+        String gender2 = "M";
+        Patient pat2 = createPatient(firstName2, lastName2, dob2, gender2);
+
+        patientService.insert(pat1);
+        patientService.insert(pat2);
+
+        List<Patient> patientsPage = patientService.getPageOfPatients(1);
+
+        int expectedPageSize = SystemConfiguration.getInstance().getDefaultPageSize();
+        Assert.assertTrue(patientsPage.size() <= expectedPageSize);
+
+        if (expectedPageSize >= 2) {
+            Assert.assertTrue(patientsPage.stream().anyMatch(p -> p.getPerson().getFirstName().equals(firstName1)));
+            Assert.assertTrue(patientsPage.stream().anyMatch(p -> p.getPerson().getFirstName().equals(firstName2)));
+        }
+    }
+
 }