diff --git a/java/src/test/java/org/plos/ned_client/api/IndividualsApiTest.java b/java/src/test/java/org/plos/ned_client/api/IndividualsApiTest.java
new file mode 100644
index 0000000..ef77364
--- /dev/null
+++ b/java/src/test/java/org/plos/ned_client/api/IndividualsApiTest.java
@@ -0,0 +1,61 @@
+package org.plos.ned_client.api;
+
+import org.plos.ned_client.*;
+import org.plos.ned_client.api.*;
+import org.plos.ned_client.model.*;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.time.*;
+import org.junit.*;
+import java.time.format.DateTimeFormatter;
+
+import static org.junit.Assert.*;
+
+public class IndividualsApiTest {
+
+  @Test
+  public void testCreateApi() {
+
+    ApiClient client = new ApiClient();
+    client.setBasePath("http://example.com");
+    client.setDebugging(true);
+
+    IndividualsApi api = new IndividualsApi(client);
+
+    assertNotNull(api.getApiClient());
+  }
+
+  @Test
+  public void testCreateIndividual() throws ApiException {
+
+    IndividualsApi api = new IndividualsApi();
+
+    IndividualComposite c = new IndividualComposite();
+
+    Individualprofile p = new Individualprofile();
+    p.setId(1);
+    p.setFirstname("test");
+    List<Individualprofile> ps = new ArrayList<Individualprofile>();
+    ps.add(p);
+
+    c.setIndividualprofiles(ps);
+
+    Group g = new Group();
+    g.setId(1);
+    g.setStartdate(LocalDate.of(1996, 2, 4));
+
+    List<Group> gs = new ArrayList<Group>();
+    gs.add(g);
+
+    c.setGroups(gs);
+
+    // TODO: mock request to/from server
+    api.createIndividual(c, null);
+
+  }
+
+  // TODO: finish from https://github.com/fehguy/swagger-codegen/blob/sample/java8/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
+
+}
diff --git a/java/src/test/java/org/plos/ned_client/model/GroupTest.java b/java/src/test/java/org/plos/ned_client/model/GroupTest.java
new file mode 100644
index 0000000..04c0446
--- /dev/null
+++ b/java/src/test/java/org/plos/ned_client/model/GroupTest.java
@@ -0,0 +1,34 @@
+package org.plos.ned_client.model;
+
+import org.plos.ned_client.model.Group;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.time.*;
+import org.junit.*;
+import java.time.format.DateTimeFormatter;
+
+import static org.junit.Assert.*;
+
+public class GroupTest {
+
+  @Test
+  public void testGroupDates() {
+
+    Group g = new Group();
+
+    g.setStartdate(LocalDate.of(1994, 2, 4));
+
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+    g.setEnddate(LocalDate.parse("2005-01-12", formatter));
+
+    assertEquals(g.getEnddate().toString(), "2005-01-12");
+    assertEquals(g.getStartdate().toString(), "1994-02-04");
+
+    // g.setCreated = new Date(1994, 2, 6);
+
+    // assertEquals(g.getCreated().toString(), "1994-02-06");
+  }
+}