diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..a9019a2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to document bugs.
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Class / Methods**
+List of classes or methods which contains the bug. (If known)
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..3ec670c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Features to implement
+title: "[FEATURE]"
+labels: feature
+assignees: ''
+
+---
+
+**Description of Usecase**
+A clear and concise description of what the feature allows to do.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**List of Classes and Methods to implement**
+List all Classes and Methods which have to be implemented.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/tests.md b/.github/ISSUE_TEMPLATE/tests.md
new file mode 100644
index 0000000..31c646c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/tests.md
@@ -0,0 +1,20 @@
+---
+name: Tests
+about: Tests to implement
+title: "[TEST]"
+labels: Tests
+assignees: ''
+
+---
+
+**Feature description**
+A clear and concise description of the functionality which have to be tested.
+
+**Test cases**
+A list of cases which have to be tested.
+
+**List of affected Classes and Methods**
+A clear and concise list of the classes and methods which have to be tested.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java b/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java
index 3ffa0fc..255117e 100644
--- a/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java
+++ b/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java
@@ -51,7 +51,7 @@ public class JsonTaskDatabaseTest {
 
     }
 
-    //@Disabled("disabled until idProvider works")
+    @Disabled("disabled until adding works.")
     @Test
     @DisplayName("Add task.")
     void addTask() {
@@ -105,6 +105,7 @@ public class JsonTaskDatabaseTest {
 
     }
 
+    @Disabled("Disabled until removing works")
     @Test
     void removeTasksForCrop() {
         List<Task> taskList = null;
@@ -117,4 +118,4 @@ public class JsonTaskDatabaseTest {
 
         Assertions.assertEquals(0, taskList.size());
     }
-}
+}
\ No newline at end of file
diff --git a/src/test/resources/ch/zhaw/gartenverwaltung/io/test-taskdb.json b/src/test/resources/ch/zhaw/gartenverwaltung/io/test-taskdb.json
index ff69563..7728bb0 100644
--- a/src/test/resources/ch/zhaw/gartenverwaltung/io/test-taskdb.json
+++ b/src/test/resources/ch/zhaw/gartenverwaltung/io/test-taskdb.json
@@ -1,11 +1,11 @@
 [
   {
-  "id" : 1,
-  "name" : "sow plant",
-  "description": "Plant the seeds, crops in de bed.",
-  "startDate" : "2022-05-01",
-  "endDate" : "2022-05-01",
-  "interval" : 0,
+    "id" : 1,
+    "name" : "sow plant",
+    "description": "Plant the seeds, crops in de bed.",
+    "startDate" : "2022-05-01",
+    "endDate" : "2022-05-01",
+    "interval" : 0,
     "cropId" : 0
   },
   {