diff --git a/application/controllers/lehre/anrechnung/RequestAnrechnung.php b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
index bc886a876..bf98e1c59 100644
--- a/application/controllers/lehre/anrechnung/RequestAnrechnung.php
+++ b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
@@ -119,7 +119,7 @@ class requestAnrechnung extends Auth_Controller
 		// Validate data
 		if (empty($_FILES['uploadfile']['name']))
 		{
-			return $this->outputJsonError($this->p->t('ui', 'errorUploadFehlt'));
+			return $this->outputJsonError($this->p->t('ui', 'errorUploadFehltOderZuGross'));
 		}
 
 		if (isEmptyString($begruendung_id) ||
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 5db9a98f1..b7804952e 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -560,7 +560,7 @@ class Prestudent_model extends DB_Model
 						o.bezeichnung,
 						(CASE
 							WHEN sg.typ = \'b\' THEN ps.prestudent_id
-							WHEN sg.typ = \'m\' THEN p.prestudent_id
+							WHEN sg.typ = \'m\' THEN ps.prestudent_id
             				ELSE NULL
        					END) AS prestudent_id
 					FROM public.tbl_prestudent p
@@ -581,7 +581,7 @@ class Prestudent_model extends DB_Model
 
 		return $this->execQuery($query, array($person_id));
 	}
-	
+
 	/**
 	 * Get latest ZGV Bezeichnung of Prestudent.
 	 *
@@ -593,19 +593,19 @@ class Prestudent_model extends DB_Model
 		{
 			show_error('Prestudent_id is not numeric.');
 		}
-		
+
 		$language_index = getUserLanguage() == 'German' ? 0 : 1;
-	
+
 		$this->addSelect('
 			COALESCE(
 				array_to_json(zgvmaster.bezeichnung::varchar[])->>' . $language_index . ',
 				array_to_json(zgv.bezeichnung::varchar[])->>' . $language_index . '
 			) AS bezeichnung'
 		);
-		
+
 		$this->addJoin('bis.tbl_zgv zgv', 'zgv_code', 'LEFT');
 		$this->addJoin('bis.tbl_zgvmaster zgvmaster', 'zgvmas_code', 'LEFT');
-		
+
 		return $this->loadWhere(array(
 			'prestudent_id' => $prestudent_id
 		));
@@ -618,8 +618,9 @@ class Prestudent_model extends DB_Model
 					JOIN public.tbl_prestudent ps USING(prestudent_id)
 					JOIN public.tbl_studiengang sg USING(studiengang_kz)
 					JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+					JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
 					WHERE ps.person_id = ?
-					AND UPPER((sg.typ || sg.kurzbz) || ':' || sp.orgform_kurzbz) = ?
+					AND UPPER(so.studiengangkurzbzlang || ':' || sp.orgform_kurzbz) = ?
 					AND pss.studiensemester_kurzbz = ?
 					AND";
 
@@ -629,7 +630,7 @@ class Prestudent_model extends DB_Model
 			$query .= " NOT EXISTS";
 
 		$query .= " (SELECT 1 FROM public.tbl_prestudentstatus spss
-					JOIN public.tbl_prestudent sps USING(prestudent_id) 
+					JOIN public.tbl_prestudent sps USING(prestudent_id)
 					WHERE sps.prestudent_id = ps.prestudent_id
 					AND spss.bewerbung_abgeschicktamum IS NOT NULL)";
 
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index e2b3bdfb7..0d0c248a6 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -495,11 +495,12 @@ class Studiengang_model extends DB_Model
 
 	public function getStudiengaengeWithOrgForm($typ, $semester)
 	{
-		$query = "SELECT DISTINCT (UPPER(sg.typ || sg.kurzbz || ':' || sp.orgform_kurzbz)) AS Studiengang
+		$query = "SELECT DISTINCT (UPPER(so.studiengangkurzbzlang || ':' || sp.orgform_kurzbz)) AS Studiengang
 					FROM public.tbl_studiengang sg
 					JOIN lehre.tbl_studienordnung USING (studiengang_kz)
 					JOIN lehre.tbl_studienplan sp USING (studienordnung_id)
 					JOIN lehre.tbl_studienplan_semester spsem USING (studienplan_id)
+					JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
 					WHERE sp.aktiv = TRUE AND sg.aktiv = TRUE AND sg.typ IN ?
 					AND spsem.studiensemester_kurzbz = ?
 					ORDER BY Studiengang";
diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index e507d3846..978dd5606 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -26,7 +26,8 @@ $this->load->view(
                 'neu',
 				'maxZeichen',
                 'errorBestaetigungFehlt',
-				'systemfehler'
+				'systemfehler',
+                'errorDokumentZuGross'
 			),
 			'anrechnung' => array(
 				'deadlineUeberschritten',
@@ -179,7 +180,7 @@ $this->load->view(
 										<div class="form-inline panel-body">
 											<div class="form-group">
 												<input type="file" id="requestAnrechnung-uploadfile"
-													   name="uploadfile" accept=".pdf" size="50"
+													   name="uploadfile" accept=".pdf" size="50" data-maxsize="<?php echo (int)ini_get('upload_max_filesize') * 1024 ?>"
 													   required>
 											</div>
 											<span id="requestAnrechnung-uploadTooltip" data-toggle="tooltip" data-placement="right"
diff --git a/application/views/system/infocenter/dokpruefung.php b/application/views/system/infocenter/dokpruefung.php
index f7446895c..b184b9a0b 100644
--- a/application/views/system/infocenter/dokpruefung.php
+++ b/application/views/system/infocenter/dokpruefung.php
@@ -65,7 +65,7 @@
 				if (!isset($formalReadonly)) :
 				?>
 					<td>
-						<input type="checkbox" class="form-check-input prchbox"
+						<input type="checkbox" class="form-check-input prchbox" autocomplete="off"
 							   id="prchkbx_<?php echo $dokument->akte_id ?>" <?php echo $geprueft ?>>
 						<span id="formalgeprueftam_<?php echo $dokument->akte_id ?>">
 						<?php echo isset($dokument->formal_geprueft_amum) ? date_format(date_create($dokument->formal_geprueft_amum), 'd.m.Y') : ''; ?>
diff --git a/application/views/system/infocenter/infocenterAbgewiesenData.php b/application/views/system/infocenter/infocenterAbgewiesenData.php
index dbe0540be..40582a668 100644
--- a/application/views/system/infocenter/infocenterAbgewiesenData.php
+++ b/application/views/system/infocenter/infocenterAbgewiesenData.php
@@ -14,7 +14,7 @@ $query = '
 			ps.prestudent_id AS "PreStudentID",
 			p.vorname AS "Vorname",
 			p.nachname AS "Nachname",
-			sg.kurzbzlang as "Studiengang",
+			so.studiengangkurzbzlang as "Studiengang",
 			pss.insertamum AS "AbgewiesenAm",
 			(
 				SELECT l.zeitpunkt
@@ -43,6 +43,8 @@ $query = '
 			JOIN public.tbl_prestudent ps USING(prestudent_id)
 			JOIN public.tbl_person p USING(person_id)
 			JOIN public.tbl_studiengang sg USING(studiengang_kz)
+			JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+			JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
 		WHERE pss.status_kurzbz = '. $ABGEWIESENEN_STATUS .'
 		AND pss.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
 		AND (sg.typ IN ('. $STUDIENGANG_TYP .') 
diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index f3849d622..49cc33326 100644
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -137,11 +137,12 @@
 				 LIMIT 1
 			) AS "AnzahlAbgeschickt",
 			(
-				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz) || \':\' || sp.orgform_kurzbz), \', \')
+				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(so.studiengangkurzbzlang) || \':\' || sp.orgform_kurzbz), \', \')
 				  FROM public.tbl_prestudentstatus pss
 				  JOIN public.tbl_prestudent ps USING(prestudent_id)
 				  JOIN public.tbl_studiengang sg USING(studiengang_kz)
 				  JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+				  JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND pss.bewerbung_abgeschicktamum IS NOT NULL
 				 -- AND pss.bestaetigtam IS NULL
@@ -162,11 +163,12 @@
 				 LIMIT 1
 			) AS "StgAbgeschickt",
 			(
-				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz) || \':\' || sp.orgform_kurzbz), \', \')
+				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(so.studiengangkurzbzlang) || \':\' || sp.orgform_kurzbz), \', \')
 				  FROM public.tbl_prestudentstatus pss
 				  JOIN public.tbl_prestudent ps USING(prestudent_id)
 				  JOIN public.tbl_studiengang sg USING(studiengang_kz)
 				  JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+				  JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND pss.bewerbung_abgeschicktamum IS NULL
 				   AND pss.bestaetigtam IS NULL
@@ -214,11 +216,12 @@
 				 LIMIT 1
 			) AS "AnzahlStgNichtAbgeschickt",
 			(
-				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz) || \':\' || sp.orgform_kurzbz), \', \')
+				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(so.studiengangkurzbzlang) || \':\' || sp.orgform_kurzbz), \', \')
 				  FROM public.tbl_prestudentstatus pss
 				  JOIN public.tbl_prestudent ps USING(prestudent_id)
 				  JOIN public.tbl_studiengang sg USING(studiengang_kz)
 				  JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+				  JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
 				 WHERE pss.status_kurzbz IN ('.$STATUS_KURZBZ.')
 				   AND pss.bewerbung_abgeschicktamum IS NULL
 				   AND ps.person_id = p.person_id
diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php
index 92f062b62..5c0adb165 100644
--- a/application/views/system/infocenter/infocenterFreigegebenData.php
+++ b/application/views/system/infocenter/infocenterFreigegebenData.php
@@ -106,11 +106,12 @@ $query = '
 				 LIMIT 1
 			) AS "AnzahlAbgeschickt",
 			(
-				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz || \':\' || sp.orgform_kurzbz)), \', \')
+				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(so.studiengangkurzbzlang) || \':\' || sp.orgform_kurzbz), \', \')
 				  FROM public.tbl_prestudentstatus pss
 				  JOIN public.tbl_prestudent ps USING(prestudent_id)
 				  JOIN public.tbl_studiengang sg USING(studiengang_kz)
 				  JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+				  JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND pss.bewerbung_abgeschicktamum IS NOT NULL
 				   AND ps.person_id = p.person_id
@@ -128,11 +129,12 @@ $query = '
 				 LIMIT 1
 			) AS "StgAbgeschickt",
 			(
-				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz) || \':\' || sp.orgform_kurzbz), \', \')
+				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(so.studiengangkurzbzlang) || \':\' || sp.orgform_kurzbz), \', \')
 				  FROM public.tbl_prestudentstatus pss
 				  JOIN public.tbl_prestudent ps USING(prestudent_id)
 				  JOIN public.tbl_studiengang sg USING(studiengang_kz)
 				  JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+				  JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
 				 WHERE pss.status_kurzbz IN ('.$STATUS_KURZBZ.')
 
 				   AND ps.person_id = p.person_id
diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
index dbc0124bc..1aeac022b 100644
--- a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
+++ b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
@@ -85,11 +85,12 @@ $query = '
 				 LIMIT 1
 			) AS "AnzahlAbgeschickt",
 			(
-				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz || \':\' || sp.orgform_kurzbz)), \', \')
+				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(so.studiengangkurzbzlang) || \':\' || sp.orgform_kurzbz), \', \')
 				  FROM public.tbl_prestudentstatus pss
 				  JOIN public.tbl_prestudent ps USING(prestudent_id)
 				  JOIN public.tbl_studiengang sg USING(studiengang_kz)
 				  JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+				  JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND pss.bewerbung_abgeschicktamum IS NOT NULL
 				   AND ps.person_id = p.person_id
diff --git a/cis/private/lehre/fotoliste.pdf.php b/cis/private/lehre/fotoliste.pdf.php
index 3fc04355f..9e7535c04 100644
--- a/cis/private/lehre/fotoliste.pdf.php
+++ b/cis/private/lehre/fotoliste.pdf.php
@@ -224,8 +224,9 @@ if ($result = $db->db_query($qry)) {
             else
                 $zusatz = '';
 
-            if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->bis > $stsemdatumvon || $row->bis == '') && $row->von < $stsemdatumbis) //Outgoing
-                $zusatz .= '(o)(ab ' . $datum->formatDatum($row->von, 'd.m.Y') . ')';
+            if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->bis > $stsemdatumvon || $row->bis == '') && $row->von < $stsemdatumbis
+                && (anzahlTage($row->von, $row->bis) >= 30)) //Outgoing
+                $zusatz .= '(o)(ab '. $datum->formatDatum($row->von, 'd.m.Y'). ')';
 
             if ($row->note == 6) //angerechnet
                 $zusatz .= '(ar)';
diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php
index 7853600de..ad25a6bc2 100644
--- a/cis/private/lehre/notenliste.xls.php
+++ b/cis/private/lehre/notenliste.xls.php
@@ -38,6 +38,8 @@ require_once('../../../include/phrasen.class.php');
 
 $uid = get_uid();
 
+
+
 $sprache = getSprache();
 $p = new phrasen($sprache);
 
@@ -112,6 +114,12 @@ else
 	$format_highlight->setBorder(1);
 	$format_highlight->setBorderColor('white');
 
+	$format_highlightright=& $workbook->addFormat();
+	$format_highlightright->setFgColor(15);
+	$format_highlightright->setBorder(1);
+	$format_highlightright->setBorderColor('white');
+	$format_highlightright->setAlign('right');
+
 	$format_border_bottom =& $workbook->addFormat();
 	$format_border_bottom ->setBottom(2);
 	$format_border_bottom->setBold();
@@ -200,27 +208,32 @@ else
 	$stsemdatumvon = $stsem_obj->start;
 	$stsemdatumbis = $stsem_obj->ende;
 
-	$qry = "SELECT
-		distinct on(nachname, vorname, person_id) vorname, nachname, matrikelnr, person_id, tbl_student.student_uid as uid,
-	tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
-	(SELECT status_kurzbz
-	FROM public.tbl_prestudentstatus
-	WHERE prestudent_id=tbl_student.prestudent_id
-	ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
-	tbl_bisio.bisio_id, tbl_bisio.bis, tbl_bisio.von,
-	tbl_zeugnisnote.note,tbl_mobilitaet.mobilitaetstyp_kurzbz,
-	(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN '1' ELSE '' END) as doubledegree
-	FROM campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid)
-	JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid)
-	LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz)
-	LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
-	AND tbl_zeugnisnote.student_uid=tbl_student.student_uid
-	AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
-	LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
-	LEFT JOIN bis.tbl_mobilitaet USING(prestudent_id)
+	$qry = "
+	SELECT
+		distinct on(nachname, vorname, person_id)
+		vorname, nachname, matrikelnr, person_id, tbl_student.student_uid as uid,
+		tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
+		(SELECT status_kurzbz
+			FROM public.tbl_prestudentstatus
+			WHERE prestudent_id=tbl_student.prestudent_id
+			ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
+		tbl_bisio.bisio_id, tbl_bisio.bis, tbl_bisio.von,
+		tbl_zeugnisnote.note,tbl_mobilitaet.mobilitaetstyp_kurzbz,
+		(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN '1' ELSE '' END) as doubledegree,
+		tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung
+	FROM
+		campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid)
+		JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid)
+		LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz)
+		LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
+			AND tbl_zeugnisnote.student_uid=tbl_student.student_uid
+				AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
+		LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
+		LEFT JOIN bis.tbl_mobilitaet USING(prestudent_id)
+		LEFT JOIN lehre.tbl_note USING(note)
 	WHERE
-	vw_student_lehrveranstaltung.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
-	vw_student_lehrveranstaltung.studiensemester_kurzbz=".$db->db_add_param($stsem);";";
+		vw_student_lehrveranstaltung.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)."
+		AND	vw_student_lehrveranstaltung.studiensemester_kurzbz=".$db->db_add_param($stsem);";";
 
 	if($lehreinheit_id!='')
 		$qry.=" AND vw_student_lehrveranstaltung.lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER);
@@ -243,18 +256,22 @@ else
 						$inc=' (i)';
 					else
 						$inc='';
-					if($elem->bisio_id!='' && $elem->status!='Incoming' && ($elem->bis > $stsemdatumvon || $elem->bis=='') && $elem->von < $stsemdatumbis) //Outgoing
-						$inc.=' (o)';
 
-					if($elem->note==6) //angerechnet
+					if($elem->bisio_id != '' && $elem->status != 'Incoming' && ($elem->bis > $stsemdatumvon || $elem->bis == '')
+						&& $elem->von < $stsemdatumbis &&	(anzahlTage($elem->von, $elem->bis) >= 30))
+							$inc.=' (o)';
+
+					$note = $elem->note;
+
+					if($elem->lkt_ueberschreibbar == 'f') // angerechnet / intern angerechnet / nicht zugelassen
 					{
-						$inc.=' (ar)';
-						$note='ar';
+						$inc.= '('. $elem->anmerkung. ')';
+						$note = $elem->anmerkung;
 					}
 
 					if ($elem->mobilitaetstyp_kurzbz !='' && $elem->doubledegree == 1) //dd-Program
 					{
-						$inc.=' (d.d.)';
+						$inc .=' (d.d.)';
 					}
 
 					$worksheet->write($lines,1,$elem->uid);
@@ -262,7 +279,7 @@ else
 					$worksheet->write($lines,3,$elem->vorname);
 					$worksheet->write($lines,4,'="'.$elem->semester.$elem->verband.$elem->gruppe.'"');
 					$worksheet->write($lines,5,'="'.trim($elem->matrikelnr).'"',$format_highlight);
-					$worksheet->write($lines,6,$note,$format_highlight);
+					$worksheet->write($lines,6, $note, $format_highlightright);
 					$i++;
 					$lines++;
 	   			}
diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php
index 4c16ab0d1..8041cf21f 100644
--- a/cis/private/profile/zeitsperre_resturlaub.php
+++ b/cis/private/profile/zeitsperre_resturlaub.php
@@ -266,14 +266,14 @@ function showHideBezeichnungDropDown()
 	if (dd.options[dd.selectedIndex].value == 'DienstV')
 	{
 		var str = '<select name="bezeichnung" class="dd_breit">';
-		str += '<option value="Eheschließung">a) Eigene Eheschließung</option>';
-		str += '<option value="Geburt eigenes Kind">b) Geburt eines Kindes der Ehefrau/Lebensgefährtin</option>';
-		str += '<option value="Heirat Kind/Geschwister">c) Eheschließung eines Kindes/eigener Geschwister</option>';
-		str += '<option value="Eigene Sponsion/Promotion">d) Teilnahme an eigener Sponsion/Promotion</option>';
-		str += '<option value="Lebensbedr. Erkrankung P/K/E">e) Lebensbedrohliche Erkrankung Partner/Kinder/Eltern</option>';
-		str += '<option value="Ableben P/K/E">f) Ableben Partner/Kinder/Elternteil</option>';
-		str += '<option value="Bestattung G/S/G">g) Teilnahme an Bestattung Geschwister/Schwiegereltern/eigener Großeltern</option>';
-		str += '<option value="Wohnungswechsel">h) Wohnungswechsel in eigenen Haushalt</option>';
+		str += '<option value="Eheschließung">a) Eigene Eheschließung (3 Tage)</option>';
+		str += '<option value="Geburt eigenes Kind">b) Geburt eines Kindes der Ehefrau/Lebensgefährtin (2 Tage)</option>';
+		str += '<option value="Heirat Kind/Geschwister">c) Eheschließung eines Kindes/eigener Geschwister (1 Tag)</option>';
+		str += '<option value="Eigene Sponsion/Promotion">d) Teilnahme an eigener Sponsion/Promotion (1 Tag)</option>';
+		str += '<option value="Lebensbedr. Erkrankung P/K/E">e) Lebensbedrohliche Erkrankung Partner/Kinder/Eltern (3 Tage)</option>';
+		str += '<option value="Ableben P/K/E">f) Ableben Partner/Kinder/Elternteil (3 Tage)</option>';
+		str += '<option value="Bestattung G/S/G">g) Teilnahme an Bestattung Geschwister/Schwiegereltern/eigener Großeltern (1 Tag)</option>';
+		str += '<option value="Wohnungswechsel">h) Wohnungswechsel in eigenen Haushalt (2 Tage)</option>';
 		str += '<option value="Bundesheer">i) Einberufung Bundesheer</option>';
 		str += '</select>';
 
diff --git a/composer.json b/composer.json
index 4d1c2a896..14e2ab141 100644
--- a/composer.json
+++ b/composer.json
@@ -313,5 +313,12 @@
 	},
 	"config": {
 		"bin-dir": "vendor/bin"
+	},
+	"require-dev": {
+		"squizlabs/php_codesniffer": "3.6.*",
+		"phpmd/phpmd": "2.*",
+		"phpmetrics/phpmetrics": "2.*",
+		"sebastian/phpcpd": "3.*"
 	}
 }
+
diff --git a/composer.lock b/composer.lock
index 6fc201986..ea8f24af0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "ab181b377c4128ccde03cc50571b7ab6",
-    "content-hash": "e19ca762a6a929e69ae3b0e649fa4f6d",
+    "hash": "7e7441d3ba7b9b2be1f647b9bfc2c941",
+    "content-hash": "d59d1c1f4957fc2e3dc019cbb99b5aa2",
     "packages": [
         {
             "name": "BlackrockDigital/startbootstrap-sb-admin-2",
@@ -1323,16 +1323,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.36",
+            "version": "2.0.37",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "a97547126396548c224703a267a30af1592be146"
+                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/a97547126396548c224703a267a30af1592be146",
-                "reference": "a97547126396548c224703a267a30af1592be146",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
+                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
                 "shasum": ""
             },
             "require": {
@@ -1410,7 +1410,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2022-01-30 08:48:36"
+            "time": "2022-04-04 04:57:45"
         },
         {
             "name": "rmariuzzo/jquery-checkboxes",
@@ -2065,7 +2065,1111 @@
             "time": "2007-12-17 09:04:44"
         }
     ],
-    "packages-dev": [],
+    "packages-dev": [
+        {
+            "name": "composer/pcre",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/pcre.git",
+                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560",
+                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.3",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Pcre\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
+            "keywords": [
+                "PCRE",
+                "preg",
+                "regex",
+                "regular expression"
+            ],
+            "time": "2022-01-21 20:24:37"
+        },
+        {
+            "name": "composer/xdebug-handler",
+            "version": "2.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/xdebug-handler.git",
+                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a",
+                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a",
+                "shasum": ""
+            },
+            "require": {
+                "composer/pcre": "^1",
+                "php": "^5.3.2 || ^7.0 || ^8.0",
+                "psr/log": "^1 || ^2 || ^3"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Composer\\XdebugHandler\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Stevenson",
+                    "email": "john-stevenson@blueyonder.co.uk"
+                }
+            ],
+            "description": "Restarts a process without Xdebug.",
+            "keywords": [
+                "Xdebug",
+                "performance"
+            ],
+            "time": "2022-02-24 20:20:32"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v4.13.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "time": "2021-11-30 19:35:32"
+        },
+        {
+            "name": "pdepend/pdepend",
+            "version": "2.10.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pdepend/pdepend.git",
+                "reference": "da3166a06b4a89915920a42444f707122a1584c9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/da3166a06b4a89915920a42444f707122a1584c9",
+                "reference": "da3166a06b4a89915920a42444f707122a1584c9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.7",
+                "symfony/config": "^2.3.0|^3|^4|^5|^6.0",
+                "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0",
+                "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0"
+            },
+            "require-dev": {
+                "easy-doc/easy-doc": "0.0.0|^1.2.3",
+                "gregwar/rst": "^1.0",
+                "phpunit/phpunit": "^4.8.36|^5.7.27",
+                "squizlabs/php_codesniffer": "^2.0.0"
+            },
+            "bin": [
+                "src/bin/pdepend"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PDepend\\": "src/main/php/PDepend"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Official version of pdepend to be handled with Composer",
+            "time": "2022-02-23 07:53:09"
+        },
+        {
+            "name": "phpmd/phpmd",
+            "version": "2.12.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpmd/phpmd.git",
+                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/c0b678ba71902f539c27c14332aa0ddcf14388ec",
+                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec",
+                "shasum": ""
+            },
+            "require": {
+                "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
+                "ext-xml": "*",
+                "pdepend/pdepend": "^2.10.3",
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "easy-doc/easy-doc": "0.0.0 || ^1.3.2",
+                "ext-json": "*",
+                "ext-simplexml": "*",
+                "gregwar/rst": "^1.0",
+                "mikey179/vfsstream": "^1.6.8",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.27",
+                "squizlabs/php_codesniffer": "^2.0"
+            },
+            "bin": [
+                "src/bin/phpmd"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "PHPMD\\": "src/main/php"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Manuel Pichler",
+                    "email": "github@manuel-pichler.de",
+                    "homepage": "https://github.com/manuelpichler",
+                    "role": "Project Founder"
+                },
+                {
+                    "name": "Marc Würth",
+                    "email": "ravage@bluewin.ch",
+                    "homepage": "https://github.com/ravage84",
+                    "role": "Project Maintainer"
+                },
+                {
+                    "name": "Other contributors",
+                    "homepage": "https://github.com/phpmd/phpmd/graphs/contributors",
+                    "role": "Contributors"
+                }
+            ],
+            "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
+            "homepage": "https://phpmd.org/",
+            "keywords": [
+                "mess detection",
+                "mess detector",
+                "pdepend",
+                "phpmd",
+                "pmd"
+            ],
+            "time": "2022-03-24 13:33:01"
+        },
+        {
+            "name": "phpmetrics/phpmetrics",
+            "version": "v2.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpmetrics/PhpMetrics.git",
+                "reference": "e279f7317390f642339941b693359e9a181817a7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/e279f7317390f642339941b693359e9a181817a7",
+                "reference": "e279f7317390f642339941b693359e9a181817a7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "nikic/php-parser": "^3|^4",
+                "php": ">=5.5"
+            },
+            "replace": {
+                "halleck45/php-metrics": "*",
+                "halleck45/phpmetrics": "*"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14",
+                "sebastian/comparator": ">=1.2.3",
+                "squizlabs/php_codesniffer": "^3.5",
+                "symfony/dom-crawler": "^3.0 || ^4.0 || ^5.0"
+            },
+            "bin": [
+                "bin/phpmetrics"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "./src/functions.php"
+                ],
+                "psr-0": {
+                    "Hal\\": "./src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jean-François Lépine",
+                    "email": "lepinejeanfrancois@yahoo.fr",
+                    "homepage": "http://www.lepine.pro",
+                    "role": "Copyright Holder"
+                }
+            ],
+            "description": "Static analyzer tool for PHP : Coupling, Cyclomatic complexity, Maintainability Index, Halstead's metrics... and more !",
+            "homepage": "http://www.phpmetrics.org",
+            "keywords": [
+                "analysis",
+                "qa",
+                "quality",
+                "testing"
+            ],
+            "time": "2022-03-24 10:19:51"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2017-02-26 11:10:40"
+        },
+        {
+            "name": "psr/container",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "time": "2017-02-14 16:28:37"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2021-05-03 11:20:27"
+        },
+        {
+            "name": "sebastian/finder-facade",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/finder-facade.git",
+                "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
+                "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
+                "shasum": ""
+            },
+            "require": {
+                "symfony/finder": "~2.3|~3.0|~4.0",
+                "theseer/fdomdocument": "~1.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
+            "homepage": "https://github.com/sebastianbergmann/finder-facade",
+            "abandoned": true,
+            "time": "2017-11-18 17:31:49"
+        },
+        {
+            "name": "sebastian/phpcpd",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpcpd.git",
+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564",
+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6|^7.0",
+                "phpunit/php-timer": "^1.0.6",
+                "sebastian/finder-facade": "^1.1",
+                "sebastian/version": "^1.0|^2.0",
+                "symfony/console": "^2.7|^3.0|^4.0"
+            },
+            "bin": [
+                "phpcpd"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Copy/Paste Detector (CPD) for PHP code.",
+            "homepage": "https://github.com/sebastianbergmann/phpcpd",
+            "time": "2017-11-16 08:49:28"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-10-03 07:35:21"
+        },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "3.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "bin": [
+                "bin/phpcs",
+                "bin/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "time": "2021-12-12 21:44:58"
+        },
+        {
+            "name": "symfony/config",
+            "version": "v3.4.47",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/config.git",
+                "reference": "bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/config/zipball/bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f",
+                "reference": "bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/filesystem": "~2.8|~3.0|~4.0",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.3",
+                "symfony/finder": "<3.3"
+            },
+            "require-dev": {
+                "symfony/dependency-injection": "~3.3|~4.0",
+                "symfony/event-dispatcher": "~3.3|~4.0",
+                "symfony/finder": "~3.3|~4.0",
+                "symfony/yaml": "~3.0|~4.0"
+            },
+            "suggest": {
+                "symfony/yaml": "To use the yaml reference dumper"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Config\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Config Component",
+            "homepage": "https://symfony.com",
+            "time": "2020-10-24 10:57:07"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v3.4.47",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "a10b1da6fc93080c180bba7219b5ff5b7518fe81"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a10b1da6fc93080c180bba7219b5ff5b7518fe81",
+                "reference": "a10b1da6fc93080c180bba7219b5ff5b7518fe81",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/debug": "~2.8|~3.0|~4.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.4",
+                "symfony/process": "<3.3"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~3.3|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+                "symfony/lock": "~3.4|~4.0",
+                "symfony/process": "~3.3|~4.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/lock": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "https://symfony.com",
+            "time": "2020-10-24 10:57:07"
+        },
+        {
+            "name": "symfony/debug",
+            "version": "v3.4.47",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/debug.git",
+                "reference": "ab42889de57fdfcfcc0759ab102e2fd4ea72dcae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/ab42889de57fdfcfcc0759ab102e2fd4ea72dcae",
+                "reference": "ab42889de57fdfcfcc0759ab102e2fd4ea72dcae",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "psr/log": "~1.0"
+            },
+            "conflict": {
+                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+            },
+            "require-dev": {
+                "symfony/http-kernel": "~2.8|~3.0|~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Debug\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Debug Component",
+            "homepage": "https://symfony.com",
+            "time": "2020-10-24 10:57:07"
+        },
+        {
+            "name": "symfony/dependency-injection",
+            "version": "v3.4.47",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/dependency-injection.git",
+                "reference": "51d2a2708c6ceadad84393f8581df1dcf9e5e84b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/51d2a2708c6ceadad84393f8581df1dcf9e5e84b",
+                "reference": "51d2a2708c6ceadad84393f8581df1dcf9e5e84b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "psr/container": "^1.0"
+            },
+            "conflict": {
+                "symfony/config": "<3.3.7",
+                "symfony/finder": "<3.3",
+                "symfony/proxy-manager-bridge": "<3.4",
+                "symfony/yaml": "<3.4"
+            },
+            "provide": {
+                "psr/container-implementation": "1.0"
+            },
+            "require-dev": {
+                "symfony/config": "~3.3|~4.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/config": "",
+                "symfony/expression-language": "For using expressions in service container configuration",
+                "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
+                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\DependencyInjection\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony DependencyInjection Component",
+            "homepage": "https://symfony.com",
+            "time": "2020-10-24 10:57:07"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v3.4.47",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "e58d7841cddfed6e846829040dca2cca0ebbbbb3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e58d7841cddfed6e846829040dca2cca0ebbbbb3",
+                "reference": "e58d7841cddfed6e846829040dca2cca0ebbbbb3",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Filesystem Component",
+            "homepage": "https://symfony.com",
+            "time": "2020-10-24 10:57:07"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v3.4.47",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "b6b6ad3db3edb1b4b1c1896b1975fb684994de6e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/b6b6ad3db3edb1b4b1c1896b1975fb684994de6e",
+                "reference": "b6b6ad3db3edb1b4b1c1896b1975fb684994de6e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "https://symfony.com",
+            "time": "2020-11-16 17:02:08"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.19.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "b5f7b932ee6fa802fc792eabd77c4c88084517ce"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b5f7b932ee6fa802fc792eabd77c4c88084517ce",
+                "reference": "b5f7b932ee6fa802fc792eabd77c4c88084517ce",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2020-10-23 09:01:57"
+        },
+        {
+            "name": "theseer/fdomdocument",
+            "version": "1.6.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/fDOMDocument.git",
+                "reference": "5cddd4f9076a9a2b85c5135935bba2dcb3ed7574"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/5cddd4f9076a9a2b85c5135935bba2dcb3ed7574",
+                "reference": "5cddd4f9076a9a2b85c5135935bba2dcb3ed7574",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "lib-libxml": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "php": ">=7.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
+            "homepage": "https://github.com/theseer/fDOMDocument",
+            "abandoned": true,
+            "time": "2022-01-25 23:10:35"
+        }
+    ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],
diff --git a/config/vilesci.config-default.inc.php b/config/vilesci.config-default.inc.php
index cd45e6979..fd03cf844 100644
--- a/config/vilesci.config-default.inc.php
+++ b/config/vilesci.config-default.inc.php
@@ -254,4 +254,13 @@ define('BIS_STANDORTCODE_LEHRGAENGE', '0');
 
 // bPk Abfrage
 define('BPK_FUER_ALLE_BENUTZER_ABFRAGEN', false);
+
+// Bei folgenden Buchungstypen wird ein Anlegen geprüft ob bereits ein Eintrag für diesen Typ vorhanden ist im selben
+// Semester und ggf ein Hinweis ausgegeben
+define('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK', serialize(
+        array('StudiengebuehrAnzahlung', 'Studiengebuehr', 'StudiengebuehrRestzahlung', 'OEH')
+));
+
+// Spezialnoten die am Zeunigs und Diplomasupplement ignoriert werden
+define('ZEUGNISNOTE_NICHT_ANZEIGEN',serialize(array('iar', 'nz')));
 ?>
diff --git a/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php b/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
index c6bee8942..fda16c07a 100644
--- a/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
+++ b/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
@@ -120,6 +120,10 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 				class="sortDirectionIndicator"
 				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz"  onclick="LehrveranstaltungNotenTreeSort()"/>
 			<splitter class="tree-splitter"/>
+			<treecol id="lehrveranstaltung-noten-tree-verband" label="Verband" flex="2" hidden="true" persist="hidden, width, ordinal"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#verband" />						
+            <splitter class="tree-splitter"/>
             <treecol id="lehrveranstaltung-noten-tree-studiengang_kz_lv" label="LehrveranstaltungStudiengang_kz" flex="1" hidden="true" persist="hidden, width, ordinal"
                      class="sortDirectionIndicator"
                      sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz_lv"  onclick="LehrveranstaltungNotenTreeSort()"/>
@@ -151,6 +155,7 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#lehrveranstaltung_id"/>
 						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang"/>
 						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz"/>
+						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#verband"/>
 						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#studiengang_kz_lv"/>
 						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#student_semester"/>
 						<treecell label="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#punkte"/>
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index a2c6eca51..4a4b64201 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -2272,6 +2272,21 @@ if(!$error)
 			$errormsg  = 'Fehlerhafte Parameteruebergabe';
 		}
 	}
+	elseif(isset($_POST['type']) && $_POST['type']=='checkbuchung')
+	{
+		$person_ids = explode(';',$_POST['person_ids']);
+		$exists = false;
+		if (defined('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK') && (in_array($_POST['buchungstyp_kurzbz'], unserialize(FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK))))
+		{
+			$konto = new konto();
+			$exists = $konto->checkDoppelteBuchung($person_ids, $_POST['studiensemester_kurzbz'], $_POST['buchungstyp_kurzbz']);
+		}
+
+		if($exists)
+			$return = true;
+		else
+			$return = false;
+	}
 	elseif(isset($_POST['type']) && $_POST['type']=='neuebuchung')
 	{
 		//Speichert eine neue Buchung
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index c41c60be1..5444504b1 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -3085,6 +3085,20 @@ function StudentKontoNeuSpeichern(dialog, person_ids, studiengang_kz)
 		return false;
 	}
 
+	var tocheck = <?php echo (defined('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK') && FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK) ? 'true' : 'false' ?>;
+
+	var exists = false;
+
+	if (tocheck)
+	{
+		exists = StudentCheckBuchung(person_ids, studiensemester_kurzbz, buchungstyp_kurzbz, studiengang_kz);
+	}
+	if (exists)
+	{
+		if(!confirm('Die Buchung ist bereits vorhanden. Trotzdem fortfahren?'))
+			return false;
+	}
+	
 	req.add('type', 'neuebuchung');
 
 	req.add('person_ids', person_ids);
@@ -3116,6 +3130,28 @@ function StudentKontoNeuSpeichern(dialog, person_ids, studiengang_kz)
 		return true;
 	}
 }
+//  ****
+// * Prüft ob die Buchung bereits vorhanden ist
+// ****
+function StudentCheckBuchung(person_ids, studiensemester_kurzbz, buchungstyp_kurzbz, studiengang_kz)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+	var req = new phpRequest(url,'','');
+	req.add('type', 'checkbuchung');
+
+	req.add('person_ids', person_ids);
+	req.add('studiensemester_kurzbz', studiensemester_kurzbz);
+	req.add('buchungstyp_kurzbz', buchungstyp_kurzbz);
+	req.add('studiengang_kz', studiengang_kz);
+
+	var response = req.executePOST();
+
+	var val =  new ParseReturnValue(response);
+	
+	return(val.dbdml_return);
+}
 
 // *****
 // * Druckt eine Zahlungsbestaetigung aus
diff --git a/include/adresse.class.php b/include/adresse.class.php
index 0d4e6a7ca..3426d358d 100644
--- a/include/adresse.class.php
+++ b/include/adresse.class.php
@@ -53,8 +53,6 @@ class adresse extends basis_db
 	public $rechnungsadresse=false;	//  boolean
 	public $anmerkung;			//  string
 	public $co_name;
-	public $adressentyp;
-	public $bezeichnung;
 	public $bezeichnung_mehrsprachig;
 
 	/**
@@ -523,29 +521,5 @@ class adresse extends basis_db
 		}
 		return true;
 	}
-
-	public function getAdressentyp()
-	{
-		$qry = "SELECT * FROM public.tbl_adressentyp ORDER BY sort";
-
-		if($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				$obj = new adresse();
-
-				$obj->adressentyp = $row->adressentyp_kurzbz;
-				$obj->bezeichnung = $row->bezeichnung;
-
-				$this->result[] = $obj;
-			}
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Daten';
-			return false;
-		}
-	}
 }
 ?>
diff --git a/include/adressentyp.class.php b/include/adressentyp.class.php
new file mode 100644
index 000000000..b3f005a94
--- /dev/null
+++ b/include/adressentyp.class.php
@@ -0,0 +1,41 @@
+<?php
+
+require_once(dirname(__FILE__) . '/basis_db.class.php');
+
+class adressentyp extends basis_db {
+
+	public $result = array();
+	public $adressentyp;
+	public $bezeichnung;
+
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function getAll()
+	{
+		$qry = "SELECT * FROM public.tbl_adressentyp ORDER BY sort";
+
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$obj = new adressentyp();
+
+				$obj->adressentyp = $row->adressentyp_kurzbz;
+				$obj->bezeichnung = $row->bezeichnung;
+
+				$this->result[] = $obj;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+}
+
+?>
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 8109a2035..7b3560dde 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -1182,4 +1182,18 @@ function generateUniqueToken($length = 64)
 
 	return $token;
 }
+
+/**
+ * Berechnet die Anzahl von ganzen Tagen zwischen zwei Daten
+ * @param string $date1 Datum im Format '2022-02-22'.
+ * @param string $date2 Datum im Format '2022-04-22'.
+ * @return Anzahl der Tage
+ */
+function anzahlTage($date1, $date2)
+{
+	$date1_ts = strtotime($date1);
+	$date2_ts = strtotime($date2);
+	$diff = $date2_ts - $date1_ts;
+	return round($diff / 86400);
+}
 ?>
diff --git a/include/konto.class.php b/include/konto.class.php
index 09afa5303..ca0950e34 100644
--- a/include/konto.class.php
+++ b/include/konto.class.php
@@ -553,31 +553,38 @@ class konto extends basis_db
 
 	/**
 	 * Überprüft, ob das Konto einer Person ausgeglichen ist, oder ob noch Zahlungen offen sind
-	 * @param $person_id ID der Person, die geprüft werden soll
-	 * @return true wenn ausgeglichen, false wenn Zahlungen offen, false mit errormsg wenn ein Fehler aufgetreten ist
+	 * @param int $person_id ID der Person, die geprüft werden soll.
+	 * @param bool $aktuelleBuchungenOnly True, wenn nur Zahlungen mit Buchungsdatum <= aktuelles Datum berücksichtigt werden sollen.
+	 * @return boolean true wenn ausgeglichen, false wenn Zahlungen offen, false mit errormsg wenn ein Fehler aufgetreten ist
 	 */
-    public function checkKontostand($person_id)
+	public function checkKontostand($person_id, $aktuelleBuchungenOnly = false)
 	{
-		$qry="SELECT sum(betrag) as summe FROM public.tbl_konto WHERE person_id=".$this->db_add_param($person_id);
-		if($result=$this->db_query($qry))
+		$qry = "SELECT sum(betrag) as summe
+				FROM public.tbl_konto
+				WHERE person_id=".$this->db_add_param($person_id);
+
+		if($aktuelleBuchungenOnly)
+			$qry .= " AND buchungsdatum <= now()";
+
+		if ($result = $this->db_query($qry))
 		{
-			if($row=$this->db_fetch_object())
+			if ($row = $this->db_fetch_object())
 			{
-				if($row->summe>=0)
+				if ($row->summe >= 0)
 					return true;
 				else
 					return false;
 			}
 			else
 			{
+				$this->errormsg = "Fehler beim Holen der Daten";
 				return false;
-				$this->errormsg="Fehler beim Holen der Daten";
 			}
 		}
 		else
 		{
+			$this->errormsg = "Fehler bei der Datenbankabfrage";
 			return false;
-			$this->errormsg="Fehler bei der Datenbankabfrage";
 		}
 	}
 
@@ -957,6 +964,30 @@ class konto extends basis_db
 			return false;
 		}
 	}
+
+	public function checkDoppelteBuchung($person_ids, $stsem, $typ)
+	{
+		$qry = "SELECT betrag
+				FROM public.tbl_konto
+				JOIN public.tbl_benutzer benutzer USING(person_id)
+				WHERE person_id IN (".$this->implode4SQL(array_filter($person_ids)).")
+				AND studiensemester_kurzbz = ".$this->db_add_param($stsem)."
+				AND buchungstyp_kurzbz = ".$this->db_add_param($typ)." 
+				GROUP BY buchungsnr";
+
+		if ($result = $this->db_query($qry))
+		{
+			if ($this->db_num_rows($result) > 0)
+				return true;
+			else
+				return false;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+			return false;
+		}
+	}
 }
 
 ?>
diff --git a/include/lehrelisthelper.class.php b/include/lehrelisthelper.class.php
index e78792732..c7fdb9959 100644
--- a/include/lehrelisthelper.class.php
+++ b/include/lehrelisthelper.class.php
@@ -202,9 +202,12 @@ class LehreListHelper
 		$qry = 'SELECT
 					distinct on(nachname, vorname, person_id) vorname, nachname, matrikelnr, public.tbl_student.student_uid,
 					tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
-					(SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=tbl_student.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
+					(SELECT status_kurzbz FROM public.tbl_prestudentstatus
+					WHERE prestudent_id=tbl_student.prestudent_id
+					ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
 					tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, tbl_student.studiengang_kz AS stg_kz_student,
-					tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_studiengang.kurzbzlang, tbl_mobilitaet.mobilitaetstyp_kurzbz,
+					tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_studiengang.kurzbzlang,
+					tbl_mobilitaet.mobilitaetstyp_kurzbz, tbl_zeugnisnote.note,
 					(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN 1 ELSE 0 END) as doubledegree
 				FROM
 					campus.vw_student_lehrveranstaltung
@@ -212,7 +215,9 @@ class LehreListHelper
 					JOIN public.tbl_person USING(person_id) LEFT JOIN public.tbl_student ON(uid=student_uid)
 					LEFT JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
 					LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz)
-					LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id AND tbl_zeugnisnote.student_uid=tbl_student.student_uid AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
+					LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
+						AND tbl_zeugnisnote.student_uid=tbl_student.student_uid
+						AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
 					LEFT JOIN lehre.tbl_note USING (note)
 					LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
 					LEFT JOIN public.tbl_studiengang ON(tbl_student.studiengang_kz=tbl_studiengang.studiengang_kz)
@@ -254,8 +259,10 @@ class LehreListHelper
 					else
 						$zusatz='';
 
-					if($row->bisio_id!='' && $row->status!='Incoming' && ($row->bis > $stsemdatumvon || $row->bis=='') && $row->von < $stsemdatumbis) //Outgoing
-						$zusatz.='(o)(ab '.$datum->formatDatum($row->von,'d.m.Y').')';
+					//Outgoing
+					if($row->bisio_id != '' && $row->status != 'Incoming' && ($row->bis > $stsemdatumvon || $row->bis == '')
+					&& $row->von < $stsemdatumbis && (anzahlTage($row->von, $row->bis) >= 30))
+						$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
 
 					if($row->lkt_ueberschreibbar == 'f') // angerechnet / intern angerechnet / nicht zugelassen
 						$zusatz.= '('. $row->anmerkung. ')';
@@ -281,7 +288,8 @@ class LehreListHelper
 									'gruppe'=>trim($row->gruppe),
 									'zusatz'=>$zusatz,
 									'studiengang_kurzbz'=>$row->kurzbzlang,
-									'mobilitaetstyp_kurzbz'=>$row->mobilitaetstyp_kurzbz
+									'mobilitaetstyp_kurzbz'=>$row->mobilitaetstyp_kurzbz,
+									'note'=>$row->note
 									));
 				}
 			}
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index eebe39d01..3a7769b2a 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -834,11 +834,26 @@ class prestudent extends person
 				$stg_obj = new studiengang();
 				$stg_obj->load($studiengang_kz);
 			    if($stg_obj->typ=='m')
-					$qry.=" AND a.rolle='Interessent' AND a.zgvmas_code is not null AND a.zgvmas_erfuellt = 't'";
+				{
+					$qry.=" AND a.rolle='Interessent' AND a.zgvmas_code is not null";
+
+					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
+						$qry .= " AND a.zgvmas_erfuellt = 't'";
+				}
 				elseif($stg_obj->typ=='p')
-					$qry.=" AND a.rolle='Interessent' AND a.zgvdoktor_code is not null AND a.zgvdoktor_erfuellt = 't'";
+				{
+					$qry.=" AND a.rolle='Interessent' AND a.zgvdoktor_code is not null";
+
+					if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
+						$qry .= " AND a.zgvdoktor_erfuellt = 't'";
+				}
 				else
-					$qry.=" AND a.rolle='Interessent' AND a.zgv_code is not null AND a.zgv_erfuellt = 't'";
+				{
+					$qry.=" AND a.rolle='Interessent' AND a.zgv_code is not null";
+
+					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
+						$qry .= " AND a.zgv_erfuellt = 't'";
+				}
 				break;
 			case "reihungstestangemeldet":
 				$qry.="
@@ -2489,10 +2504,14 @@ class prestudent extends person
 		$qry = "SELECT
 					UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) as kuerzel
 				FROM
-					public.tbl_prestudent
+					public.tbl_prestudent pt
 					JOIN public.tbl_prestudentstatus USING (prestudent_id)
 					JOIN public.tbl_studiengang USING (studiengang_kz)
 				WHERE person_id = ".$this->db_add_param($person_id, FHC_INTEGER)."
+					AND NOT EXISTS
+						(SELECT * FROM public.tbl_prestudentstatus ps
+						WHERE ps.prestudent_id = pt.prestudent_id
+						AND status_kurzbz = 'Abbrecher' )
 					AND status_kurzbz in ('Absolvent','Diplomand','Unterbrecher','Student')
 					AND typ in ('b','m','d')
 				ORDER BY status_kurzbz ASC
diff --git a/include/zeugnisnote.class.php b/include/zeugnisnote.class.php
index f045e99c2..5ad5d4e58 100644
--- a/include/zeugnisnote.class.php
+++ b/include/zeugnisnote.class.php
@@ -256,7 +256,7 @@ class zeugnisnote extends basis_db
 	 *        $studiensemester_kurzbz
 	 * @return true wenn ok, false wenn Fehler
 	 */
-	public function getZeugnisnoten($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz)
+	public function getZeugnisnoten($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz, $nichtAnzeigen = null)
 	{
 		$where='';
 		if($lehrveranstaltung_id!=null)
@@ -265,6 +265,8 @@ class zeugnisnote extends basis_db
 			$where.=" AND uid=".$this->db_add_param($student_uid);
 		if($studiensemester_kurzbz!=null)
 			$where.=" AND vw_student_lehrveranstaltung.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
+		if ($nichtAnzeigen != null)
+			$where.=" AND tbl_note.anmerkung NOT IN (".$this->db_implode4SQL($nichtAnzeigen).")";
 		$where2='';
 		if($lehrveranstaltung_id!=null)
 			$where2.=" AND lehrveranstaltung_id=".$this->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
@@ -272,6 +274,8 @@ class zeugnisnote extends basis_db
 			$where2.=" AND student_uid=".$this->db_add_param($student_uid);
 		if($studiensemester_kurzbz!=null)
 			$where2.=" AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
+		if ($nichtAnzeigen != null)
+			$where2.=" AND tbl_note.anmerkung NOT IN (".$this->db_implode4SQL($nichtAnzeigen).")";
 
 		$qry = "SELECT vw_student_lehrveranstaltung.lehrveranstaltung_id, uid,
 					   vw_student_lehrveranstaltung.studiensemester_kurzbz, note, punkte, uebernahmedatum, benotungsdatum,
diff --git a/phpci.yml b/phpci.yml
deleted file mode 100644
index 2978796e3..000000000
--- a/phpci.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-# Globally valid entries
-build_settings:
-    ignore: # Ignores vendor and tests folders
-        - "vendor"
-        - "tests"
-    pgsql: # PostgreSQL connection parameters
-        host: "localhost;dbname=template1" # Connects to the template1 database to be able to drop database fhcomplete
-        user: "fhcomplete"
-        pass: "fhcomplete"
-
-setup: # First!
-    pgsql: # Close previous connections to database -> drop database -> create database
-        - "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = 'fhcomplete';"
-        - "DROP DATABASE IF EXISTS fhcomplete;"
-        - "CREATE DATABASE fhcomplete;"
-    composer: # Run composer to install all the required 3rd party software
-    shell:
-        # Install addons
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Abrechnung.git %BUILD_PATH%/addons/abrechnung"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Asterisk.git %BUILD_PATH%/addons/asterisk"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Aufnahme.git %BUILD_PATH%/addons/aufnahme"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Bewerbung.git %BUILD_PATH%/addons/bewerbung"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-CaseTime.git %BUILD_PATH%/addons/casetime"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-LDAP.git %BUILD_PATH%/addons/ldap"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Lehrmittel.git %BUILD_PATH%/addons/lehrmittel"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-LV-Evaluierung.git %BUILD_PATH%/addons/lvevaluierung"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-LVInfo.git %BUILD_PATH%/addons/lvinfo"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Kompetenzen.git %BUILD_PATH%/addons/kompetenzen"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Moodle.git %BUILD_PATH%/addons/moodle"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Reports.git %BUILD_PATH%/addons/reports"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Studiengangsverwaltung.git %BUILD_PATH%/addons/studiengangsverwaltung"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Textbausteine.git %BUILD_PATH%/addons/textbausteine"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-WaWi.git %BUILD_PATH%/addons/wawi"
-        # Copy addons configs
-        - "cp -R /var/www/configs/fhc/abrechnung/* %BUILD_PATH%/addons/abrechnung"
-        - "cp -R /var/www/configs/fhc/asterisk/* %BUILD_PATH%/addons/asterisk"
-        - "cp -R /var/www/configs/fhc/bewerbung/* %BUILD_PATH%/addons/bewerbung"
-        - "cp -R /var/www/configs/fhc/casetime/* %BUILD_PATH%/addons/casetime"
-        - "cp -R /var/www/configs/fhc/lehrmittel/* %BUILD_PATH%/addons/lehrmittel"
-        - "cp -R /var/www/configs/fhc/lvinfo/* %BUILD_PATH%/addons/lvinfo"
-        - "cp -R /var/www/configs/fhc/reports/* %BUILD_PATH%/addons/reports"
-        - "cp -R /var/www/configs/fhc/wawi/* %BUILD_PATH%/addons/wawi"
-        # Copy core configs and .htaccess
-        - "cp -R /var/www/configs/fhc/configs/* ./config"
-        - "cp /var/www/configs/fhc/configs/.htaccess ./cis/private/"
-        - "cp /var/www/configs/fhc/configs/.htaccess ./content"
-        - "cp /var/www/configs/fhc/configs/.htaccess ./rdf"
-        - "cp /var/www/configs/fhc/configs/.htaccess ./system"
-        - "cp /var/www/configs/fhc/configs/.htaccess ./vilesci"
-        # Create core directories
-        - "mkdir documents"
-        - "mkdir documents/csv_import"
-        - "mkdir documents/dms"
-        - "mkdir documents/import"
-        - "mkdir documents/benotungstool"
-        - "mkdir paabgabe"
-        # Copy codeigniter configs
-        - "mkdir ./application/config/development"
-        - "cp -R /var/www/configs/ci/* ./application/config/development"
-        # Clone extensions
-        - "git clone --quiet https://github.com/FH-Complete/FHC-Core-MobilityOnline.git /tmp/FHC-Core-MobilityOnline"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-Core-Budget.git /tmp/FHC-Core-Budget"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-Core-DSMS.git /tmp/FHC-Core-DSMS"
-        - "git clone --quiet https://github.com/FH-Complete/FHC-Core-Nextcloud.git /tmp/FHC-Core-Nextcloud"
-        # Create extensions archives
-        - "tar cfzP /tmp/FHC-Core-MobilityOnline.tgz /tmp/FHC-Core-MobilityOnline/"
-        - "tar cfzP /tmp/FHC-Core-Budget.tgz /tmp/FHC-Core-Budget/"
-        - "tar cfzP /tmp/FHC-Core-DSMS.tgz /tmp/FHC-Core-DSMS/"
-        - "tar cfzP /tmp/FHC-Core-Nextcloud.tgz /tmp/FHC-Core-Nextcloud/"
-        # Install extensions
-        #- "php index.ci.php system/extensions/CLI_Manager uploadExtension FHC-Core-MobilityOnline /tmp/FHC-Core-MobilityOnline.tgz"
-        #- "php index.ci.php system/extensions/CLI_Manager uploadExtension FHC-Core-Budget /tmp/FHC-Core-Budget.tgz"
-        #- "php index.ci.php system/extensions/CLI_Manager uploadExtension FHC-Core-DSMS /tmp/FHC-Core-DSMS.tgz"
-        #- "php index.ci.php system/extensions/CLI_Manager uploadExtension FHC-Core-Nextcloud /tmp/FHC-Core-Nextcloud.tgz"
-        # Remove temporary files
-        - "rm -fR /tmp/FHC-Core-MobilityOnline*"
-        - "rm -fR /tmp/FHC-Core-Budget*"
-        - "rm -fR /tmp/FHC-Core-DSMS*"
-        - "rm -fR /tmp/FHC-Core-Nextcloud*"
-        # Change files permissions
-        - "chmod -R 0770 *"
-        - "find . -type f -exec chmod 0644 {} \\;"
-        # Create a symlink to the current build folder
-        - "ln -s %BUILD_PATH% ../fhcomplete"
-
-test: # Run tests
-    php_parallel_lint: # Lint cannot fail!
-    php_mess_detector: # Mess detector
-        rules:
-        - "unusedcode"
-        - "codesize"
-        - "design"
-        allow_failures: true
-    php_cpd: # Copy/paste detector
-        ignore:
-        - "rdf"
-        - "config"
-        - "locale"
-        - "application/config"
-        - "application/views"
-        # Global ignore is overwritten by the specific one
-        - "vendor"
-        - "tests"
-        allow_failures: true
-    php_code_sniffer: # Code sniffer
-        standard: "tests/codesniffer/FHComplete"
-        ignore:
-        - "rdf"
-        - "locale"
-        - "application/views"
-        allowed_warnings: -1 # Warnings are ignored for a successful build
-        allow_failures: true
-    #codeception: # Codeception
-    #    config: "tests/codeception/"
-    #    path: "tests/codeception/_output/"
-    #    allow_failures: true
-
-failure: # On failure
-    email: # Send an email to warn the team
-        default_mailto_address: systementwicklung@technikum-wien.at
-
-complete: # Last!
-    pgsql: # Close previous connections to database -> drop database
-        - "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = 'fhcomplete';"
-        - "DROP DATABASE IF EXISTS fhcomplete;"
-    shell: # Remove the previously created symlink
-        - "rm ../fhcomplete"
diff --git a/public/js/lehre/anrechnung/requestAnrechnung.js b/public/js/lehre/anrechnung/requestAnrechnung.js
index fa7d02de8..b664812dc 100644
--- a/public/js/lehre/anrechnung/requestAnrechnung.js
+++ b/public/js/lehre/anrechnung/requestAnrechnung.js
@@ -3,6 +3,8 @@ const ANRECHNUNGSTATUS_REJECTED = 'rejected';
 const HERKUNFT_DER_KENNTNISSE_MAX_LENGTH = 125;
 
 $(function(){
+    const uploadMaxFilesize = $('#requestAnrechnung-uploadfile').data('maxsize')  ; // in byte
+
     // Set status alert color
     requestAnrechnung.setStatusAlertColor();
 
@@ -26,6 +28,12 @@ $(function(){
         // Avoid form redirecting automatically
         e.preventDefault();
 
+        var fileInput = $('#requestAnrechnung-uploadfile');
+        if (!requestAnrechnung.fileSizeOk(fileInput, uploadMaxFilesize)) // in byte
+        {
+            return FHC_DialogLib.alertWarning(FHC_PhrasesLib.t("ui", "errorDokumentZuGross"));
+        }
+
         FHC_AjaxClient.ajaxCallPost(
             FHC_JS_DATA_STORAGE_OBJECT.called_path + "/apply",
             {
@@ -161,5 +169,19 @@ var requestAnrechnung = {
 
         // Disable all form elements
         $("#requestAnrechnung-form :input").prop("disabled", true);
+    },
+    fileSizeOk: function(fileInput, maxSize){
+
+        if (fileInput.get(0).files.length){
+
+            var fileSize = fileInput.get(0).files[0].size; // in bytes
+
+            if (fileSize > maxSize)
+            {
+                return false;
+            }
+
+            return true;
+        }
     }
 }
\ No newline at end of file
diff --git a/rdf/adressentyp.rdf.php b/rdf/adressentyp.rdf.php
index b34a96cc6..1f12cc6eb 100644
--- a/rdf/adressentyp.rdf.php
+++ b/rdf/adressentyp.rdf.php
@@ -30,9 +30,9 @@ header("Content-type: application/xhtml+xml");
 echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 // DAO
 require_once('../config/vilesci.config.inc.php');
-require_once('../include/adresse.class.php');
+require_once('../include/adressentyp.class.php');
 
-$adresse = new adresse();
+$adresse = new adressentyp();
 
 $rdf_url='http://www.technikum-wien.at/adressentyp';
 echo '
@@ -44,7 +44,7 @@ echo '
    <RDF:Seq about="'.$rdf_url.'/liste">
 ';
 
-if ($adresse->getAdressentyp())
+if ($adresse->getAll())
 {
 	foreach ($adresse->result as $row)
 	{
diff --git a/rdf/diplomasupplement.xml.php b/rdf/diplomasupplement.xml.php
index d55187c6c..47da798b7 100644
--- a/rdf/diplomasupplement.xml.php
+++ b/rdf/diplomasupplement.xml.php
@@ -649,7 +649,16 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			WHERE
 				student_uid = ".$db->db_add_param($uid_arr[$i])."
 				AND zeugnis = true
-				AND studiensemester_kurzbz in (".$sqlStudent->implode4SQL($aktuellesSemester).")
+				AND studiensemester_kurzbz in (".$sqlStudent->implode4SQL($aktuellesSemester).")";
+
+			if (defined('ZEUGNISNOTE_NICHT_ANZEIGEN'))
+			{
+				$qry .="
+					AND note.anmerkung NOT IN (".$sqlStudent->implode4SQL(unserialize(ZEUGNISNOTE_NICHT_ANZEIGEN)).")
+				";
+			};
+
+			$qry .= "
 				AND NOT EXISTS(SELECT 1 FROM bis.tbl_bisio JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 					WHERE lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
 					AND student_uid=".$db->db_add_param($uid_arr[$i])."
@@ -916,6 +925,13 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 									lehrveranstaltung_id = ".$db->db_add_param($row_outgoing->lehrveranstaltung_id)."
 									AND student_uid = ".$db->db_add_param($uid_arr[$i]);
 
+						if (defined('ZEUGNISNOTE_NICHT_ANZEIGEN'))
+						{
+							$qry_outgoing_note .= "
+								AND tbl_note.anmerkung NOT IN (".$db->implode4SQL(unserialize(ZEUGNISNOTE_NICHT_ANZEIGEN)).")
+							";
+						};
+
 						if($result_outgoing_note = $db->db_query($qry_outgoing_note))
 						{
 							if($row_outgoing_note = $db->db_fetch_object($result_outgoing_note))
diff --git a/rdf/zeugnis.rdf.php b/rdf/zeugnis.rdf.php
index 53d948424..2021c8335 100644
--- a/rdf/zeugnis.rdf.php
+++ b/rdf/zeugnis.rdf.php
@@ -256,9 +256,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 				}
 
 				$obj = new zeugnisnote();
-
-				$obj->getZeugnisnoten($lehrveranstaltung_id=null, $uid_arr[$i], $studiensemester_kurzbz);
-
+				$obj->getZeugnisnoten($lehrveranstaltung_id=null, $uid_arr[$i], $studiensemester_kurzbz, (defined('ZEUGNISNOTE_NICHT_ANZEIGEN')) ? unserialize(ZEUGNISNOTE_NICHT_ANZEIGEN) : null);
 				$ects_gesamt = $ects_gesamt_positiv = 0;
 				$prestudent_id = $row->prestudent_id;
 
diff --git a/rdf/zeugnisnote.rdf.php b/rdf/zeugnisnote.rdf.php
index 7bbc893e9..a2f01a2b9 100644
--- a/rdf/zeugnisnote.rdf.php
+++ b/rdf/zeugnisnote.rdf.php
@@ -118,6 +118,7 @@ foreach ($obj->result as $row)
 				<NOTE:student_vorname><![CDATA['.$benutzer->vorname.']]></NOTE:student_vorname>
 				<NOTE:studiengang><![CDATA['.(isset($stg_arr[$benutzer->studiengang_kz])?$stg_arr[$benutzer->studiengang_kz]:'').']]></NOTE:studiengang>
 				<NOTE:studiengang_kz><![CDATA['.$benutzer->studiengang_kz.']]></NOTE:studiengang_kz>
+				<NOTE:verband><![CDATA['.$benutzer->verband.']]></NOTE:verband>
 				<NOTE:studiengang_lv><![CDATA['.$stg_arr[$lv_obj->studiengang_kz].']]></NOTE:studiengang_lv>
 				<NOTE:studiengang_kz_lv><![CDATA['.$lv_obj->studiengang_kz.']]></NOTE:studiengang_kz_lv>
 				<NOTE:semester_lv><![CDATA['.$lv_obj->semester.']]></NOTE:semester_lv>
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 79b46b107..6605f00d4 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1026,7 +1026,9 @@ $filters = array(
 					{"name": "nachname"},
 					{"name": "matrikelnummer"},
 					{"name": "studiengang"},
-					{"name": "studiensemester"}
+					{"name": "studiensemester"},
+					{"name": "last_status"},
+					{"name": "bismelden"}
 				],
 				"filters": []
 			}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 3b43a1ac0..4b1c12bbd 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -12353,6 +12353,46 @@ array(
 			)
 		)
 	),
+    array(
+        'app' => 'core',
+        'category' => 'ui',
+        'phrase' => 'errorDokumentZuGross',
+        'insertvon' => 'system',
+        'phrases' => array(
+            array(
+                'sprache' => 'German',
+                'text' => "Dokument zu groß",
+                'description' => '',
+                'insertvon' => 'system'
+            ),
+            array(
+                'sprache' => 'English',
+                'text' => "Document maximum size exceeded",
+                'description' => '',
+                'insertvon' => 'system'
+            )
+        )
+    ),
+    array(
+        'app' => 'core',
+        'category' => 'ui',
+        'phrase' => 'errorUploadFehltOderZuGross',
+        'insertvon' => 'system',
+        'phrases' => array(
+            array(
+                'sprache' => 'German',
+                'text' => "Dokument fehlt oder zu groß",
+                'description' => '',
+                'insertvon' => 'system'
+            ),
+            array(
+                'sprache' => 'English',
+                'text' => "Document missing or maximum size exceeded",
+                'description' => '',
+                'insertvon' => 'system'
+            )
+        )
+    ),
 	array(
 		'app' => 'core',
 		'category' => 'ui',
diff --git a/tests/codeception/_bootstrap.php b/tests/codeception/_bootstrap.php
deleted file mode 100644
index 243f9c85b..000000000
--- a/tests/codeception/_bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// This is global bootstrap for autoloading
diff --git a/tests/codeception/_data/.placeholder b/tests/codeception/_data/.placeholder
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/codeception/_output/.placeholder b/tests/codeception/_output/.placeholder
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/codeception/_support/AcceptanceTester.php b/tests/codeception/_support/AcceptanceTester.php
deleted file mode 100644
index 4c7dcbb6d..000000000
--- a/tests/codeception/_support/AcceptanceTester.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class AcceptanceTester extends \Codeception\Actor
-{
-    use _generated\AcceptanceTesterActions;
-
-   /**
-    * Define custom actions here
-    */
-}
diff --git a/tests/codeception/_support/ApiTester.php b/tests/codeception/_support/ApiTester.php
deleted file mode 100644
index 1b707cc30..000000000
--- a/tests/codeception/_support/ApiTester.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class ApiTester extends \Codeception\Actor
-{
-	const WAIT = 70000; // 0.07 seconds
-	
-    use _generated\ApiTesterActions;
-
-   /**
-    * Define custom actions here
-    */
-	
-	public function wait($micro_seconds = null)
-	{
-		if (!is_null($micro_seconds))
-		{
-			usleep($micro_seconds);
-		}
-		else
-		{
-			usleep(ApiTester::WAIT);
-		}
-	}
-}
\ No newline at end of file
diff --git a/tests/codeception/_support/FunctionalTester.php b/tests/codeception/_support/FunctionalTester.php
deleted file mode 100644
index 7e888f8b2..000000000
--- a/tests/codeception/_support/FunctionalTester.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class FunctionalTester extends \Codeception\Actor
-{
-    use _generated\FunctionalTesterActions;
-
-   /**
-    * Define custom actions here
-    */
-}
diff --git a/tests/codeception/_support/UnitTester.php b/tests/codeception/_support/UnitTester.php
deleted file mode 100644
index 7ad121442..000000000
--- a/tests/codeception/_support/UnitTester.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class UnitTester extends \Codeception\Actor
-{
-    use _generated\UnitTesterActions;
-
-   /**
-    * Define custom actions here
-    */
-}
\ No newline at end of file
diff --git a/tests/codeception/_support/_generated/AcceptanceTesterActions.php b/tests/codeception/_support/_generated/AcceptanceTesterActions.php
deleted file mode 100644
index e5e86bcd5..000000000
--- a/tests/codeception/_support/_generated/AcceptanceTesterActions.php
+++ /dev/null
@@ -1,2436 +0,0 @@
-<?php  //[STAMP] e53c152fab9a8533149de0a16cc227c5
-namespace _generated;
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-use Codeception\Module\Db;
-use Codeception\Module\PhpBrowser;
-
-trait AcceptanceTesterActions
-{
-    /**
-     * @return \Codeception\Scenario
-     */
-    abstract protected function getScenario();
-
-    
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Inserts an SQL record into a database. This record will be erased after the test.
-     *
-     * ``` php
-     * <?php
-     * $I->haveInDatabase('users', array('name' => 'miles', 'email' => 'miles@davis.com'));
-     * ?>
-     * ```
-     *
-     * @param string $table
-     * @param array $data
-     *
-     * @return integer $id
-     * @see \Codeception\Module\Db::haveInDatabase()
-     */
-    public function haveInDatabase($table, $data) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveInDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that a row with the given column values exists.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if no such user found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Db::seeInDatabase()
-     */
-    public function canSeeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInDatabase', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that a row with the given column values exists.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if no such user found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * @see \Codeception\Module\Db::seeInDatabase()
-     */
-    public function seeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that the given number of records were found in the database.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumRecords(1, 'users', ['name' => 'davert'])
-     * ?>
-     * ```
-     *
-     * @param int $expectedNumber Expected number
-     * @param string $table Table name
-     * @param array $criteria Search criteria [Optional]
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Db::seeNumRecords()
-     */
-    public function canSeeNumRecords($expectedNumber, $table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumRecords', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that the given number of records were found in the database.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumRecords(1, 'users', ['name' => 'davert'])
-     * ?>
-     * ```
-     *
-     * @param int $expectedNumber Expected number
-     * @param string $table Table name
-     * @param array $criteria Search criteria [Optional]
-     * @see \Codeception\Module\Db::seeNumRecords()
-     */
-    public function seeNumRecords($expectedNumber, $table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumRecords', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Effect is opposite to ->seeInDatabase
-     *
-     * Asserts that there is no record with the given column values in a database.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if such user was found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Db::dontSeeInDatabase()
-     */
-    public function cantSeeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInDatabase', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Effect is opposite to ->seeInDatabase
-     *
-     * Asserts that there is no record with the given column values in a database.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if such user was found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * @see \Codeception\Module\Db::dontSeeInDatabase()
-     */
-    public function dontSeeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Fetches a single column value from a database.
-     * Provide table name, desired column and criteria.
-     *
-     * ``` php
-     * <?php
-     * $mail = $I->grabFromDatabase('users', 'email', array('name' => 'Davert'));
-     * ```
-     *
-     * @param string $table
-     * @param string $column
-     * @param array $criteria
-     *
-     * @return mixed
-     * @see \Codeception\Module\Db::grabFromDatabase()
-     */
-    public function grabFromDatabase($table, $column, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Returns the number of rows in a database
-     *
-     * @param string $table    Table name
-     * @param array  $criteria Search criteria [Optional]
-     *
-     * @return int
-     * @see \Codeception\Module\Db::grabNumRecords()
-     */
-    public function grabNumRecords($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabNumRecords', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Alias to `haveHttpHeader`
-     *
-     * @param $name
-     * @param $value
-     * @see \Codeception\Module\PhpBrowser::setHeader()
-     */
-    public function setHeader($name, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('setHeader', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Authenticates user for HTTP_AUTH
-     *
-     * @param $username
-     * @param $password
-     * @see \Codeception\Module\PhpBrowser::amHttpAuthenticated()
-     */
-    public function amHttpAuthenticated($username, $password) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amHttpAuthenticated', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Open web page at the given absolute URL and sets its hostname as the base host.
-     *
-     * ``` php
-     * <?php
-     * $I->amOnUrl('http://codeception.com');
-     * $I->amOnPage('/quickstart'); // moves to http://codeception.com/quickstart
-     * ?>
-     * ```
-     * @see \Codeception\Module\PhpBrowser::amOnUrl()
-     */
-    public function amOnUrl($url) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Changes the subdomain for the 'url' configuration parameter.
-     * Does not open a page; use `amOnPage` for that.
-     *
-     * ``` php
-     * <?php
-     * // If config is: 'http://mysite.com'
-     * // or config is: 'http://www.mysite.com'
-     * // or config is: 'http://company.mysite.com'
-     *
-     * $I->amOnSubdomain('user');
-     * $I->amOnPage('/');
-     * // moves to http://user.mysite.com/
-     * ?>
-     * ```
-     *
-     * @param $subdomain
-     *
-     * @return mixed
-     * @see \Codeception\Module\PhpBrowser::amOnSubdomain()
-     */
-    public function amOnSubdomain($subdomain) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnSubdomain', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Low-level API method.
-     * If Codeception commands are not enough, use [Guzzle HTTP Client](http://guzzlephp.org/) methods directly
-     *
-     * Example:
-     *
-     * ``` php
-     * <?php
-     * $I->executeInGuzzle(function (\GuzzleHttp\Client $client) {
-     *      $client->get('/get', ['query' => ['foo' => 'bar']]);
-     * });
-     * ?>
-     * ```
-     *
-     * It is not recommended to use this command on a regular basis.
-     * If Codeception lacks important Guzzle Client methods, implement them and submit patches.
-     *
-     * @param callable $function
-     * @see \Codeception\Module\PhpBrowser::executeInGuzzle()
-     */
-    public function executeInGuzzle($function) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('executeInGuzzle', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sets the HTTP header to the passed value - which is used on
-     * subsequent HTTP requests through PhpBrowser.
-     *
-     * Example:
-     * ```php
-     * <?php
-     * $I->setHeader('X-Requested-With', 'Codeception');
-     * $I->amOnPage('test-headers.php');
-     * ?>
-     * ```
-     *
-     * @param string $name the name of the request header
-     * @param string $value the value to set it to for subsequent
-     *        requests
-     * @see \Codeception\Lib\InnerBrowser::haveHttpHeader()
-     */
-    public function haveHttpHeader($name, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveHttpHeader', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Deletes the header with the passed name.  Subsequent requests
-     * will not have the deleted header in its request.
-     *
-     * Example:
-     * ```php
-     * <?php
-     * $I->haveHttpHeader('X-Requested-With', 'Codeception');
-     * $I->amOnPage('test-headers.php');
-     * // ...
-     * $I->deleteHeader('X-Requested-With');
-     * $I->amOnPage('some-other-page.php');
-     * ?>
-     * ```
-     *
-     * @param string $name the name of the header to delete.
-     * @see \Codeception\Lib\InnerBrowser::deleteHeader()
-     */
-    public function deleteHeader($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteHeader', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Opens the page for the given relative URI.
-     *
-     * ``` php
-     * <?php
-     * // opens front page
-     * $I->amOnPage('/');
-     * // opens /register page
-     * $I->amOnPage('/register');
-     * ```
-     *
-     * @param $page
-     * @see \Codeception\Lib\InnerBrowser::amOnPage()
-     */
-    public function amOnPage($page) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Perform a click on a link or a button, given by a locator.
-     * If a fuzzy locator is given, the page will be searched for a button, link, or image matching the locator string.
-     * For buttons, the "value" attribute, "name" attribute, and inner text are searched.
-     * For links, the link text is searched.
-     * For images, the "alt" attribute and inner text of any parent links are searched.
-     *
-     * The second parameter is a context (CSS or XPath locator) to narrow the search.
-     *
-     * Note that if the locator matches a button of type `submit`, the form will be submitted.
-     *
-     * ``` php
-     * <?php
-     * // simple link
-     * $I->click('Logout');
-     * // button of form
-     * $I->click('Submit');
-     * // CSS button
-     * $I->click('#form input[type=submit]');
-     * // XPath
-     * $I->click('//form/*[@type=submit]');
-     * // link in context
-     * $I->click('Logout', '#nav');
-     * // using strict locator
-     * $I->click(['link' => 'Login']);
-     * ?>
-     * ```
-     *
-     * @param $link
-     * @param $context
-     * @see \Codeception\Lib\InnerBrowser::click()
-     */
-    public function click($link, $context = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string (case insensitive).
-     *
-     * You can specify a specific HTML element (via CSS or XPath) as the second
-     * parameter to only search within that element.
-     *
-     * ``` php
-     * <?php
-     * $I->see('Logout');                 // I can suppose user is logged in
-     * $I->see('Sign Up', 'h1');          // I can suppose it's a signup page
-     * $I->see('Sign Up', '//body/h1');   // with XPath
-     * ```
-     *
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->see('strong')` will return true for strings like:
-     *
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     *
-     * But will *not* be true for strings like:
-     *
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     *
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::see()
-     */
-    public function canSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('see', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string (case insensitive).
-     *
-     * You can specify a specific HTML element (via CSS or XPath) as the second
-     * parameter to only search within that element.
-     *
-     * ``` php
-     * <?php
-     * $I->see('Logout');                 // I can suppose user is logged in
-     * $I->see('Sign Up', 'h1');          // I can suppose it's a signup page
-     * $I->see('Sign Up', '//body/h1');   // with XPath
-     * ```
-     *
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->see('strong')` will return true for strings like:
-     *
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     *
-     * But will *not* be true for strings like:
-     *
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     *
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * @see \Codeception\Lib\InnerBrowser::see()
-     */
-    public function see($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('see', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page doesn't contain the text specified (case insensitive).
-     * Give a locator as the second parameter to match a specific region.
-     *
-     * ```php
-     * <?php
-     * $I->dontSee('Login');                    // I can suppose user is already logged in
-     * $I->dontSee('Sign Up','h1');             // I can suppose it's not a signup page
-     * $I->dontSee('Sign Up','//body/h1');      // with XPath
-     * ```
-     *
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->dontSee('strong')` will fail on strings like:
-     *
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     *
-     * But will ignore strings like:
-     *
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     *
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSee()
-     */
-    public function cantSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSee', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page doesn't contain the text specified (case insensitive).
-     * Give a locator as the second parameter to match a specific region.
-     *
-     * ```php
-     * <?php
-     * $I->dontSee('Login');                    // I can suppose user is already logged in
-     * $I->dontSee('Sign Up','h1');             // I can suppose it's not a signup page
-     * $I->dontSee('Sign Up','//body/h1');      // with XPath
-     * ```
-     *
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->dontSee('strong')` will fail on strings like:
-     *
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     *
-     * But will ignore strings like:
-     *
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     *
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * @see \Codeception\Lib\InnerBrowser::dontSee()
-     */
-    public function dontSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSee', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInSource()
-     */
-    public function canSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSource', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * @see \Codeception\Lib\InnerBrowser::seeInSource()
-     */
-    public function seeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSource', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
-     */
-    public function cantSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInSource', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
-     */
-    public function dontSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInSource', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there's a link with the specified text.
-     * Give a full URL as the second parameter to match links with that exact URL.
-     *
-     * ``` php
-     * <?php
-     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
-     * $I->seeLink('Logout','/logout'); // matches <a href="/logout">Logout</a>
-     * ?>
-     * ```
-     *
-     * @param      $text
-     * @param null $url
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeLink()
-     */
-    public function canSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there's a link with the specified text.
-     * Give a full URL as the second parameter to match links with that exact URL.
-     *
-     * ``` php
-     * <?php
-     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
-     * $I->seeLink('Logout','/logout'); // matches <a href="/logout">Logout</a>
-     * ?>
-     * ```
-     *
-     * @param      $text
-     * @param null $url
-     * @see \Codeception\Lib\InnerBrowser::seeLink()
-     */
-    public function seeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page doesn't contain a link with the given string.
-     * If the second parameter is given, only links with a matching "href" attribute will be checked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
-     * $I->dontSeeLink('Checkout now', '/store/cart.php');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @param null $url
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
-     */
-    public function cantSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page doesn't contain a link with the given string.
-     * If the second parameter is given, only links with a matching "href" attribute will be checked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
-     * $I->dontSeeLink('Checkout now', '/store/cart.php');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @param null $url
-     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
-     */
-    public function dontSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeLink', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current URI contains the given string.
-     *
-     * ``` php
-     * <?php
-     * // to match: /home/dashboard
-     * $I->seeInCurrentUrl('home');
-     * // to match: /users/1
-     * $I->seeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
-     */
-    public function canSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInCurrentUrl', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current URI contains the given string.
-     *
-     * ``` php
-     * <?php
-     * // to match: /home/dashboard
-     * $I->seeInCurrentUrl('home');
-     * // to match: /users/1
-     * $I->seeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
-     */
-    public function seeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInCurrentUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URI doesn't contain the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
-     */
-    public function cantSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URI doesn't contain the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
-     */
-    public function dontSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInCurrentUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL is equal to the given string.
-     * Unlike `seeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
-     */
-    public function canSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL is equal to the given string.
-     * Unlike `seeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
-     */
-    public function seeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL doesn't equal the given string.
-     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // current url is not root
-     * $I->dontSeeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
-     */
-    public function cantSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL doesn't equal the given string.
-     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // current url is not root
-     * $I->dontSeeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
-     */
-    public function dontSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL matches the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
-     */
-    public function canSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL matches the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
-     */
-    public function seeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current url doesn't match the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
-     */
-    public function cantSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current url doesn't match the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
-     */
-    public function dontSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlMatches', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Executes the given regular expression against the current URI and returns the first match.
-     * If no parameters are provided, the full URI is returned.
-     *
-     * ``` php
-     * <?php
-     * $user_id = $I->grabFromCurrentUrl('~$/user/(\d+)/~');
-     * $uri = $I->grabFromCurrentUrl();
-     * ?>
-     * ```
-     *
-     * @param null $uri
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabFromCurrentUrl()
-     */
-    public function grabFromCurrentUrl($uri = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromCurrentUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the specified checkbox is checked.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
-     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
-     */
-    public function canSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCheckboxIsChecked', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the specified checkbox is checked.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
-     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
-     */
-    public function seeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCheckboxIsChecked', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Check that the specified checkbox is unchecked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
-     */
-    public function cantSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Check that the specified checkbox is unchecked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
-     */
-    public function dontSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCheckboxIsChecked', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given input field or textarea contains the given value.
-     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInField('Body','Type your comment here');
-     * $I->seeInField('form textarea[name=body]','Type your comment here');
-     * $I->seeInField('form input[type=hidden]','hidden_value');
-     * $I->seeInField('#searchform input','Search');
-     * $I->seeInField('//form/*[@name=search]','Search');
-     * $I->seeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInField()
-     */
-    public function canSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInField', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given input field or textarea contains the given value.
-     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInField('Body','Type your comment here');
-     * $I->seeInField('form textarea[name=body]','Type your comment here');
-     * $I->seeInField('form input[type=hidden]','hidden_value');
-     * $I->seeInField('#searchform input','Search');
-     * $I->seeInField('//form/*[@name=search]','Search');
-     * $I->seeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * @see \Codeception\Lib\InnerBrowser::seeInField()
-     */
-    public function seeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInField', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that an input field or textarea doesn't contain the given value.
-     * For fuzzy locators, the field is matched by label text, CSS and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInField('Body','Type your comment here');
-     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
-     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
-     * $I->dontSeeInField('#searchform input','Search');
-     * $I->dontSeeInField('//form/*[@name=search]','Search');
-     * $I->dontSeeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
-     */
-    public function cantSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInField', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that an input field or textarea doesn't contain the given value.
-     * For fuzzy locators, the field is matched by label text, CSS and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInField('Body','Type your comment here');
-     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
-     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
-     * $I->dontSeeInField('#searchform input','Search');
-     * $I->dontSeeInField('//form/*[@name=search]','Search');
-     * $I->dontSeeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
-     */
-    public function dontSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInField', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are set on the form matched with the
-     * passed selector.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('form[name=myform]', [
-     *      'input1' => 'value',
-     *      'input2' => 'other value',
-     * ]);
-     * ?>
-     * ```
-     *
-     * For multi-select elements, or to check values of multiple elements with the same name, an
-     * array may be passed:
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('.form-class', [
-     *      'multiselect' => [
-     *          'value1',
-     *          'value2',
-     *      ],
-     *      'checkbox[]' => [
-     *          'a checked value',
-     *          'another checked value',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // passes if checked
-     *      'checkbox2' => false,       // passes if unchecked
-     * ]);
-     * ?>
-     * ```
-     *
-     * Pair this with submitForm for quick testing magic.
-     *
-     * ``` php
-     * <?php
-     * $form = [
-     *      'field1' => 'value',
-     *      'field2' => 'another value',
-     *      'checkbox1' => true,
-     *      // ...
-     * ];
-     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
-     * // $I->amOnPage('/path/to/form-page') may be needed
-     * $I->seeInFormFields('//form[@id=my-form]', $form);
-     * ?>
-     * ```
-     *
-     * @param $formSelector
-     * @param $params
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
-     */
-    public function canSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInFormFields', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are set on the form matched with the
-     * passed selector.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('form[name=myform]', [
-     *      'input1' => 'value',
-     *      'input2' => 'other value',
-     * ]);
-     * ?>
-     * ```
-     *
-     * For multi-select elements, or to check values of multiple elements with the same name, an
-     * array may be passed:
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('.form-class', [
-     *      'multiselect' => [
-     *          'value1',
-     *          'value2',
-     *      ],
-     *      'checkbox[]' => [
-     *          'a checked value',
-     *          'another checked value',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // passes if checked
-     *      'checkbox2' => false,       // passes if unchecked
-     * ]);
-     * ?>
-     * ```
-     *
-     * Pair this with submitForm for quick testing magic.
-     *
-     * ``` php
-     * <?php
-     * $form = [
-     *      'field1' => 'value',
-     *      'field2' => 'another value',
-     *      'checkbox1' => true,
-     *      // ...
-     * ];
-     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
-     * // $I->amOnPage('/path/to/form-page') may be needed
-     * $I->seeInFormFields('//form[@id=my-form]', $form);
-     * ?>
-     * ```
-     *
-     * @param $formSelector
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
-     */
-    public function seeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are not set on the form matched with
-     * the passed selector.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('form[name=myform]', [
-     *      'input1' => 'non-existent value',
-     *      'input2' => 'other non-existent value',
-     * ]);
-     * ?>
-     * ```
-     *
-     * To check that an element hasn't been assigned any one of many values, an array can be passed
-     * as the value:
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('.form-class', [
-     *      'fieldName' => [
-     *          'This value shouldn\'t be set',
-     *          'And this value shouldn\'t be set',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // fails if checked
-     *      'checkbox2' => false,       // fails if unchecked
-     * ]);
-     * ?>
-     * ```
-     *
-     * @param $formSelector
-     * @param $params
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
-     */
-    public function cantSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInFormFields', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are not set on the form matched with
-     * the passed selector.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('form[name=myform]', [
-     *      'input1' => 'non-existent value',
-     *      'input2' => 'other non-existent value',
-     * ]);
-     * ?>
-     * ```
-     *
-     * To check that an element hasn't been assigned any one of many values, an array can be passed
-     * as the value:
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('.form-class', [
-     *      'fieldName' => [
-     *          'This value shouldn\'t be set',
-     *          'And this value shouldn\'t be set',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // fails if checked
-     *      'checkbox2' => false,       // fails if unchecked
-     * ]);
-     * ?>
-     * ```
-     *
-     * @param $formSelector
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
-     */
-    public function dontSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInFormFields', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Submits the given form on the page, optionally with the given form
-     * values.  Pass the form field's values as an array in the second
-     * parameter.
-     *
-     * Although this function can be used as a short-hand version of
-     * `fillField()`, `selectOption()`, `click()` etc. it has some important
-     * differences:
-     *
-     *  * Only field *names* may be used, not CSS/XPath selectors nor field labels
-     *  * If a field is sent to this function that does *not* exist on the page,
-     *    it will silently be added to the HTTP request.  This is helpful for testing
-     *    some types of forms, but be aware that you will *not* get an exception
-     *    like you would if you called `fillField()` or `selectOption()` with
-     *    a missing field.
-     *
-     * Fields that are not provided will be filled by their values from the page,
-     * or from any previous calls to `fillField()`, `selectOption()` etc.
-     * You don't need to click the 'Submit' button afterwards.
-     * This command itself triggers the request to form's action.
-     *
-     * You can optionally specify which button's value to include
-     * in the request with the last parameter (as an alternative to
-     * explicitly setting its value in the second parameter), as
-     * button values are not otherwise included in the request.
-     *
-     * Examples:
-     *
-     * ``` php
-     * <?php
-     * $I->submitForm('#login', [
-     *     'login' => 'davert',
-     *     'password' => '123456'
-     * ]);
-     * // or
-     * $I->submitForm('#login', [
-     *     'login' => 'davert',
-     *     'password' => '123456'
-     * ], 'submitButtonName');
-     *
-     * ```
-     *
-     * For example, given this sample "Sign Up" form:
-     *
-     * ``` html
-     * <form action="/sign_up">
-     *     Login:
-     *     <input type="text" name="user[login]" /><br/>
-     *     Password:
-     *     <input type="password" name="user[password]" /><br/>
-     *     Do you agree to our terms?
-     *     <input type="checkbox" name="user[agree]" /><br/>
-     *     Select pricing plan:
-     *     <select name="plan">
-     *         <option value="1">Free</option>
-     *         <option value="2" selected="selected">Paid</option>
-     *     </select>
-     *     <input type="submit" name="submitButton" value="Submit" />
-     * </form>
-     * ```
-     *
-     * You could write the following to submit it:
-     *
-     * ``` php
-     * <?php
-     * $I->submitForm(
-     *     '#userForm',
-     *     [
-     *         'user' => [
-     *             'login' => 'Davert',
-     *             'password' => '123456',
-     *             'agree' => true
-     *         ]
-     *     ],
-     *     'submitButton'
-     * );
-     * ```
-     * Note that "2" will be the submitted value for the "plan" field, as it is
-     * the selected option.
-     *
-     * You can also emulate a JavaScript submission by not specifying any
-     * buttons in the third parameter to submitForm.
-     *
-     * ```php
-     * <?php
-     * $I->submitForm(
-     *     '#userForm',
-     *     [
-     *         'user' => [
-     *             'login' => 'Davert',
-     *             'password' => '123456',
-     *             'agree' => true
-     *         ]
-     *     ]
-     * );
-     * ```
-     *
-     * This function works well when paired with `seeInFormFields()`
-     * for quickly testing CRUD interfaces and form validation logic.
-     *
-     * ``` php
-     * <?php
-     * $form = [
-     *      'field1' => 'value',
-     *      'field2' => 'another value',
-     *      'checkbox1' => true,
-     *      // ...
-     * ];
-     * $I->submitForm('#my-form', $form, 'submitButton');
-     * // $I->amOnPage('/path/to/form-page') may be needed
-     * $I->seeInFormFields('#my-form', $form);
-     * ```
-     *
-     * Parameter values can be set to arrays for multiple input fields
-     * of the same name, or multi-select combo boxes.  For checkboxes,
-     * you can use either the string value or boolean `true`/`false` which will
-     * be replaced by the checkbox's value in the DOM.
-     *
-     * ``` php
-     * <?php
-     * $I->submitForm('#my-form', [
-     *      'field1' => 'value',
-     *      'checkbox' => [
-     *          'value of first checkbox',
-     *          'value of second checkbox',
-     *      ],
-     *      'otherCheckboxes' => [
-     *          true,
-     *          false,
-     *          false
-     *      ],
-     *      'multiselect' => [
-     *          'first option value',
-     *          'second option value'
-     *      ]
-     * ]);
-     * ```
-     *
-     * Mixing string and boolean values for a checkbox's value is not supported
-     * and may produce unexpected results.
-     *
-     * Field names ending in `[]` must be passed without the trailing square
-     * bracket characters, and must contain an array for its value.  This allows
-     * submitting multiple values with the same name, consider:
-     *
-     * ```php
-     * <?php
-     * // This will NOT work correctly
-     * $I->submitForm('#my-form', [
-     *     'field[]' => 'value',
-     *     'field[]' => 'another value',  // 'field[]' is already a defined key
-     * ]);
-     * ```
-     *
-     * The solution is to pass an array value:
-     *
-     * ```php
-     * <?php
-     * // This way both values are submitted
-     * $I->submitForm('#my-form', [
-     *     'field' => [
-     *         'value',
-     *         'another value',
-     *     ]
-     * ]);
-     * ```
-     *
-     * @param $selector
-     * @param $params
-     * @param $button
-     * @see \Codeception\Lib\InnerBrowser::submitForm()
-     */
-    public function submitForm($selector, $params, $button = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Fills a text field or textarea with the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->fillField("//input[@type='text']", "Hello World!");
-     * $I->fillField(['name' => 'email'], 'jon@mail.com');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * @see \Codeception\Lib\InnerBrowser::fillField()
-     */
-    public function fillField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Selects an option in a select tag or in radio button group.
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('form select[name=account]', 'Premium');
-     * $I->selectOption('form input[name=payment]', 'Monthly');
-     * $I->selectOption('//form/select[@name=account]', 'Monthly');
-     * ?>
-     * ```
-     *
-     * Provide an array for the second argument to select multiple options:
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('Which OS do you use?', array('Windows','Linux'));
-     * ?>
-     * ```
-     *
-     * Or provide an associative array for the second argument to specifically define which selection method should be used:
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('Which OS do you use?', array('text' => 'Windows')); // Only search by text 'Windows'
-     * $I->selectOption('Which OS do you use?', array('value' => 'windows')); // Only search by value 'windows'
-     * ?>
-     + ```
-     *
-     * @param $select
-     * @param $option
-     * @see \Codeception\Lib\InnerBrowser::selectOption()
-     */
-    public function selectOption($select, $option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Ticks a checkbox. For radio buttons, use the `selectOption` method instead.
-     *
-     * ``` php
-     * <?php
-     * $I->checkOption('#agree');
-     * ?>
-     * ```
-     *
-     * @param $option
-     * @see \Codeception\Lib\InnerBrowser::checkOption()
-     */
-    public function checkOption($option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('checkOption', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Unticks a checkbox.
-     *
-     * ``` php
-     * <?php
-     * $I->uncheckOption('#notify');
-     * ?>
-     * ```
-     *
-     * @param $option
-     * @see \Codeception\Lib\InnerBrowser::uncheckOption()
-     */
-    public function uncheckOption($option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('uncheckOption', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Attaches a file relative to the Codeception data directory to the given file upload field.
-     *
-     * ``` php
-     * <?php
-     * // file is stored in 'tests/_data/prices.xls'
-     * $I->attachFile('input[@type="file"]', 'prices.xls');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $filename
-     * @see \Codeception\Lib\InnerBrowser::attachFile()
-     */
-    public function attachFile($field, $filename) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * If your page triggers an ajax request, you can perform it manually.
-     * This action sends a GET ajax request with specified params.
-     *
-     * See ->sendAjaxPostRequest for examples.
-     *
-     * @param $uri
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::sendAjaxGetRequest()
-     */
-    public function sendAjaxGetRequest($uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxGetRequest', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * If your page triggers an ajax request, you can perform it manually.
-     * This action sends a POST ajax request with specified params.
-     * Additional params can be passed as array.
-     *
-     * Example:
-     *
-     * Imagine that by clicking checkbox you trigger ajax request which updates user settings.
-     * We emulate that click by running this ajax request manually.
-     *
-     * ``` php
-     * <?php
-     * $I->sendAjaxPostRequest('/updateSettings', array('notifications' => true)); // POST
-     * $I->sendAjaxGetRequest('/updateSettings', array('notifications' => true)); // GET
-     *
-     * ```
-     *
-     * @param $uri
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::sendAjaxPostRequest()
-     */
-    public function sendAjaxPostRequest($uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxPostRequest', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * If your page triggers an ajax request, you can perform it manually.
-     * This action sends an ajax request with specified method and params.
-     *
-     * Example:
-     *
-     * You need to perform an ajax request specifying the HTTP method.
-     *
-     * ``` php
-     * <?php
-     * $I->sendAjaxRequest('PUT', '/posts/7', array('title' => 'new title'));
-     *
-     * ```
-     *
-     * @param $method
-     * @param $uri
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::sendAjaxRequest()
-     */
-    public function sendAjaxRequest($method, $uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxRequest', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Finds and returns the text contents of the given element.
-     * If a fuzzy locator is used, the element is found using CSS, XPath,
-     * and by matching the full page source by regular expression.
-     *
-     * ``` php
-     * <?php
-     * $heading = $I->grabTextFrom('h1');
-     * $heading = $I->grabTextFrom('descendant-or-self::h1');
-     * $value = $I->grabTextFrom('~<input value=(.*?)]~sgi'); // match with a regex
-     * ?>
-     * ```
-     *
-     * @param $cssOrXPathOrRegex
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabTextFrom()
-     */
-    public function grabTextFrom($cssOrXPathOrRegex) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabTextFrom', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Grabs the value of the given attribute value from the given element.
-     * Fails if element is not found.
-     *
-     * ``` php
-     * <?php
-     * $I->grabAttributeFrom('#tooltip', 'title');
-     * ?>
-     * ```
-     *
-     *
-     * @param $cssOrXpath
-     * @param $attribute
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabAttributeFrom()
-     */
-    public function grabAttributeFrom($cssOrXpath, $attribute) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabAttributeFrom', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Grabs either the text content, or attribute values, of nodes
-     * matched by $cssOrXpath and returns them as an array.
-     *
-     * ```html
-     * <a href="#first">First</a>
-     * <a href="#second">Second</a>
-     * <a href="#third">Third</a>
-     * ```
-     *
-     * ```php
-     * <?php
-     * // would return ['First', 'Second', 'Third']
-     * $aLinkText = $I->grabMultiple('a');
-     *
-     * // would return ['#first', '#second', '#third']
-     * $aLinks = $I->grabMultiple('a', 'href');
-     * ?>
-     * ```
-     *
-     * @param $cssOrXpath
-     * @param $attribute
-     * @return string[]
-     * @see \Codeception\Lib\InnerBrowser::grabMultiple()
-     */
-    public function grabMultiple($cssOrXpath, $attribute = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabMultiple', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $field
-     *
-     * @return array|mixed|null|string
-     * @see \Codeception\Lib\InnerBrowser::grabValueFrom()
-     */
-    public function grabValueFrom($field) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sets a cookie with the given name and value.
-     * You can set additional cookie params like `domain`, `path`, `expires`, `secure` in array passed as last argument.
-     *
-     * ``` php
-     * <?php
-     * $I->setCookie('PHPSESSID', 'el4ukv0kqbvoirg7nkp4dncpk3');
-     * ?>
-     * ```
-     *
-     * @param $name
-     * @param $val
-     * @param array $params
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::setCookie()
-     */
-    public function setCookie($name, $val, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Grabs a cookie value.
-     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabCookie()
-     */
-    public function grabCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that a cookie with the given name is set.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCookie('PHPSESSID');
-     * ?>
-     * ```
-     *
-     * @param $cookie
-     * @param array $params
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCookie()
-     */
-    public function canSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that a cookie with the given name is set.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCookie('PHPSESSID');
-     * ?>
-     * ```
-     *
-     * @param $cookie
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::seeCookie()
-     */
-    public function seeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there isn't a cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
-     */
-    public function cantSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there isn't a cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
-     */
-    public function dontSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Unsets cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::resetCookie()
-     */
-    public function resetCookie($name, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element exists on the page and is visible.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->seeElement('.error');
-     * $I->seeElement('//form/input[1]');
-     * $I->seeElement('input', ['name' => 'login']);
-     * $I->seeElement('input', ['value' => '123456']);
-     *
-     * // strict locator in first arg, attributes in second
-     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * @return
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeElement()
-     */
-    public function canSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element exists on the page and is visible.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->seeElement('.error');
-     * $I->seeElement('//form/input[1]');
-     * $I->seeElement('input', ['name' => 'login']);
-     * $I->seeElement('input', ['value' => '123456']);
-     *
-     * // strict locator in first arg, attributes in second
-     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * @return
-     * @see \Codeception\Lib\InnerBrowser::seeElement()
-     */
-    public function seeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element is invisible or not present on the page.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeElement('.error');
-     * $I->dontSeeElement('//form/input[1]');
-     * $I->dontSeeElement('input', ['name' => 'login']);
-     * $I->dontSeeElement('input', ['value' => '123456']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
-     */
-    public function cantSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element is invisible or not present on the page.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeElement('.error');
-     * $I->dontSeeElement('//form/input[1]');
-     * $I->dontSeeElement('input', ['name' => 'login']);
-     * $I->dontSeeElement('input', ['value' => '123456']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
-     */
-    public function dontSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElement', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there are a certain number of elements matched by the given locator on the page.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumberOfElements('tr', 10);
-     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
-     * ?>
-     * ```
-     * @param $selector
-     * @param mixed $expected :
-     * - string: strict number
-     * - array: range of numbers [0,10]
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
-     */
-    public function canSeeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there are a certain number of elements matched by the given locator on the page.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumberOfElements('tr', 10);
-     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
-     * ?>
-     * ```
-     * @param $selector
-     * @param mixed $expected :
-     * - string: strict number
-     * - array: range of numbers [0,10]
-     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
-     */
-    public function seeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is selected.
-     *
-     * ``` php
-     * <?php
-     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
-     */
-    public function canSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is selected.
-     *
-     * ``` php
-     * <?php
-     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
-     */
-    public function seeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is not selected.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
-     */
-    public function cantSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is not selected.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
-     */
-    public function dontSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeOptionIsSelected', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that current page has 404 response status code.
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
-     */
-    public function canSeePageNotFound() {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seePageNotFound', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that current page has 404 response status code.
-     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
-     */
-    public function seePageNotFound() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seePageNotFound', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that response code is equal to value provided.
-     *
-     * ```php
-     * <?php
-     * $I->seeResponseCodeIs(200);
-     *
-     * // recommended \Codeception\Util\HttpCode
-     * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
-     *
-     * @param $code
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
-     */
-    public function canSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIs', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that response code is equal to value provided.
-     *
-     * ```php
-     * <?php
-     * $I->seeResponseCodeIs(200);
-     *
-     * // recommended \Codeception\Util\HttpCode
-     * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
-     *
-     * @param $code
-     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
-     */
-    public function seeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIs', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that response code is equal to value provided.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeResponseCodeIs(200);
-     *
-     * // recommended \Codeception\Util\HttpCode
-     * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
-     * @param $code
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
-     */
-    public function cantSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseCodeIs', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that response code is equal to value provided.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeResponseCodeIs(200);
-     *
-     * // recommended \Codeception\Util\HttpCode
-     * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
-     * @param $code
-     * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
-     */
-    public function dontSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeResponseCodeIs', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title contains the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInTitle('Blog - Post #1');
-     * ?>
-     * ```
-     *
-     * @param $title
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
-     */
-    public function canSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title contains the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInTitle('Blog - Post #1');
-     * ?>
-     * ```
-     *
-     * @param $title
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
-     */
-    public function seeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title does not contain the given string.
-     *
-     * @param $title
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
-     */
-    public function cantSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title does not contain the given string.
-     *
-     * @param $title
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
-     */
-    public function dontSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInTitle', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Switch to iframe or frame on the page.
-     *
-     * Example:
-     * ``` html
-     * <iframe name="another_frame" src="http://example.com">
-     * ```
-     *
-     * ``` php
-     * <?php
-     * # switch to iframe
-     * $I->switchToIframe("another_frame");
-     * ```
-     *
-     * @param string $name
-     * @see \Codeception\Lib\InnerBrowser::switchToIframe()
-     */
-    public function switchToIframe($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToIframe', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Moves back in history.
-     *
-     * @param int $numberOfSteps (default value 1)
-     * @see \Codeception\Lib\InnerBrowser::moveBack()
-     */
-    public function moveBack($numberOfSteps = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveBack', func_get_args()));
-    }
-}
diff --git a/tests/codeception/_support/_generated/ApiTesterActions.php b/tests/codeception/_support/_generated/ApiTesterActions.php
deleted file mode 100644
index 60644825c..000000000
--- a/tests/codeception/_support/_generated/ApiTesterActions.php
+++ /dev/null
@@ -1,1382 +0,0 @@
-<?php  //[STAMP] 0812542cd2776efd31bd7510a679b5b1
-namespace _generated;
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-use Codeception\Module\Db;
-use Codeception\Module\REST;
-
-trait ApiTesterActions
-{
-    /**
-     * @return \Codeception\Scenario
-     */
-    abstract protected function getScenario();
-
-    
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Inserts an SQL record into a database. This record will be erased after the test.
-     *
-     * ``` php
-     * <?php
-     * $I->haveInDatabase('users', array('name' => 'miles', 'email' => 'miles@davis.com'));
-     * ?>
-     * ```
-     *
-     * @param string $table
-     * @param array $data
-     *
-     * @return integer $id
-     * @see \Codeception\Module\Db::haveInDatabase()
-     */
-    public function haveInDatabase($table, $data) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveInDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that a row with the given column values exists.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if no such user found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Db::seeInDatabase()
-     */
-    public function canSeeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInDatabase', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that a row with the given column values exists.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if no such user found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * @see \Codeception\Module\Db::seeInDatabase()
-     */
-    public function seeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that the given number of records were found in the database.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumRecords(1, 'users', ['name' => 'davert'])
-     * ?>
-     * ```
-     *
-     * @param int $expectedNumber Expected number
-     * @param string $table Table name
-     * @param array $criteria Search criteria [Optional]
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Db::seeNumRecords()
-     */
-    public function canSeeNumRecords($expectedNumber, $table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumRecords', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that the given number of records were found in the database.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumRecords(1, 'users', ['name' => 'davert'])
-     * ?>
-     * ```
-     *
-     * @param int $expectedNumber Expected number
-     * @param string $table Table name
-     * @param array $criteria Search criteria [Optional]
-     * @see \Codeception\Module\Db::seeNumRecords()
-     */
-    public function seeNumRecords($expectedNumber, $table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumRecords', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Effect is opposite to ->seeInDatabase
-     *
-     * Asserts that there is no record with the given column values in a database.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if such user was found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Db::dontSeeInDatabase()
-     */
-    public function cantSeeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInDatabase', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Effect is opposite to ->seeInDatabase
-     *
-     * Asserts that there is no record with the given column values in a database.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if such user was found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * @see \Codeception\Module\Db::dontSeeInDatabase()
-     */
-    public function dontSeeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Fetches a single column value from a database.
-     * Provide table name, desired column and criteria.
-     *
-     * ``` php
-     * <?php
-     * $mail = $I->grabFromDatabase('users', 'email', array('name' => 'Davert'));
-     * ```
-     *
-     * @param string $table
-     * @param string $column
-     * @param array $criteria
-     *
-     * @return mixed
-     * @see \Codeception\Module\Db::grabFromDatabase()
-     */
-    public function grabFromDatabase($table, $column, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Returns the number of rows in a database
-     *
-     * @param string $table    Table name
-     * @param array  $criteria Search criteria [Optional]
-     *
-     * @return int
-     * @see \Codeception\Module\Db::grabNumRecords()
-     */
-    public function grabNumRecords($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabNumRecords', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sets HTTP header valid for all next requests. Use `deleteHeader` to unset it
-     *
-     * ```php
-     * <?php
-     * $I->haveHttpHeader('Content-Type', 'application/json');
-     * // all next requests will contain this header
-     * ?>
-     * ```
-     *
-     * @param $name
-     * @param $value
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::haveHttpHeader()
-     */
-    public function haveHttpHeader($name, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveHttpHeader', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks over the given HTTP header and (optionally)
-     * its value, asserting that are there
-     *
-     * @param $name
-     * @param $value
-     * @part json
-     * @part xml
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::seeHttpHeader()
-     */
-    public function canSeeHttpHeader($name, $value = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeHttpHeader', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks over the given HTTP header and (optionally)
-     * its value, asserting that are there
-     *
-     * @param $name
-     * @param $value
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::seeHttpHeader()
-     */
-    public function seeHttpHeader($name, $value = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeHttpHeader', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks over the given HTTP header and (optionally)
-     * its value, asserting that are not there
-     *
-     * @param $name
-     * @param $value
-     * @part json
-     * @part xml
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::dontSeeHttpHeader()
-     */
-    public function cantSeeHttpHeader($name, $value = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeHttpHeader', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks over the given HTTP header and (optionally)
-     * its value, asserting that are not there
-     *
-     * @param $name
-     * @param $value
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::dontSeeHttpHeader()
-     */
-    public function dontSeeHttpHeader($name, $value = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeHttpHeader', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that http response header is received only once.
-     * HTTP RFC2616 allows multiple response headers with the same name.
-     * You can check that you didn't accidentally sent the same header twice.
-     *
-     * ``` php
-     * <?php
-     * $I->seeHttpHeaderOnce('Cache-Control');
-     * ?>>
-     * ```
-     *
-     * @param $name
-     * @part json
-     * @part xml
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::seeHttpHeaderOnce()
-     */
-    public function canSeeHttpHeaderOnce($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeHttpHeaderOnce', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that http response header is received only once.
-     * HTTP RFC2616 allows multiple response headers with the same name.
-     * You can check that you didn't accidentally sent the same header twice.
-     *
-     * ``` php
-     * <?php
-     * $I->seeHttpHeaderOnce('Cache-Control');
-     * ?>>
-     * ```
-     *
-     * @param $name
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::seeHttpHeaderOnce()
-     */
-    public function seeHttpHeaderOnce($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeHttpHeaderOnce', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Returns the value of the specified header name
-     *
-     * @param $name
-     * @param Boolean $first Whether to return the first value or all header values
-     *
-     * @return string|array The first header value if $first is true, an array of values otherwise
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::grabHttpHeader()
-     */
-    public function grabHttpHeader($name, $first = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabHttpHeader', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Adds HTTP authentication via username/password.
-     *
-     * @param $username
-     * @param $password
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::amHttpAuthenticated()
-     */
-    public function amHttpAuthenticated($username, $password) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amHttpAuthenticated', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Adds Digest authentication via username/password.
-     *
-     * @param $username
-     * @param $password
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::amDigestAuthenticated()
-     */
-    public function amDigestAuthenticated($username, $password) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amDigestAuthenticated', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Adds Bearer authentication via access token.
-     *
-     * @param $accessToken
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::amBearerAuthenticated()
-     */
-    public function amBearerAuthenticated($accessToken) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amBearerAuthenticated', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sends a POST request to given uri.
-     *
-     * Parameters and files (as array of filenames) can be provided.
-     *
-     * @param $url
-     * @param array|\JsonSerializable $params
-     * @param array $files
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::sendPOST()
-     */
-    public function sendPOST($url, $params = null, $files = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendPOST', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sends a HEAD request to given uri.
-     *
-     * @param $url
-     * @param array $params
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::sendHEAD()
-     */
-    public function sendHEAD($url, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendHEAD', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sends an OPTIONS request to given uri.
-     *
-     * @param $url
-     * @param array $params
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::sendOPTIONS()
-     */
-    public function sendOPTIONS($url, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendOPTIONS', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sends a GET request to given uri.
-     *
-     * @param $url
-     * @param array $params
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::sendGET()
-     */
-    public function sendGET($url, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendGET', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sends PUT request to given uri.
-     *
-     * @param $url
-     * @param array $params
-     * @param array $files
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::sendPUT()
-     */
-    public function sendPUT($url, $params = null, $files = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendPUT', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sends PATCH request to given uri.
-     *
-     * @param       $url
-     * @param array $params
-     * @param array $files
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::sendPATCH()
-     */
-    public function sendPATCH($url, $params = null, $files = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendPATCH', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sends DELETE request to given uri.
-     *
-     * @param $url
-     * @param array $params
-     * @param array $files
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::sendDELETE()
-     */
-    public function sendDELETE($url, $params = null, $files = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendDELETE', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sends LINK request to given uri.
-     *
-     * @param       $url
-     * @param array $linkEntries (entry is array with keys "uri" and "link-param")
-     *
-     * @link http://tools.ietf.org/html/rfc2068#section-19.6.2.4
-     *
-     * @author samva.ua@gmail.com
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::sendLINK()
-     */
-    public function sendLINK($url, $linkEntries) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendLINK', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sends UNLINK request to given uri.
-     *
-     * @param       $url
-     * @param array $linkEntries (entry is array with keys "uri" and "link-param")
-     * @link http://tools.ietf.org/html/rfc2068#section-19.6.2.4
-     * @author samva.ua@gmail.com
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::sendUNLINK()
-     */
-    public function sendUNLINK($url, $linkEntries) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendUNLINK', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks whether last response was valid JSON.
-     * This is done with json_last_error function.
-     *
-     * @part json
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::seeResponseIsJson()
-     */
-    public function canSeeResponseIsJson() {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseIsJson', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks whether last response was valid JSON.
-     * This is done with json_last_error function.
-     *
-     * @part json
-     * @see \Codeception\Module\REST::seeResponseIsJson()
-     */
-    public function seeResponseIsJson() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseIsJson', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks whether the last response contains text.
-     *
-     * @param $text
-     * @part json
-     * @part xml
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::seeResponseContains()
-     */
-    public function canSeeResponseContains($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseContains', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks whether the last response contains text.
-     *
-     * @param $text
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::seeResponseContains()
-     */
-    public function seeResponseContains($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseContains', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks whether last response do not contain text.
-     *
-     * @param $text
-     * @part json
-     * @part xml
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::dontSeeResponseContains()
-     */
-    public function cantSeeResponseContains($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseContains', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks whether last response do not contain text.
-     *
-     * @param $text
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::dontSeeResponseContains()
-     */
-    public function dontSeeResponseContains($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeResponseContains', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks whether the last JSON response contains provided array.
-     * The response is converted to array with json_decode($response, true)
-     * Thus, JSON is represented by associative array.
-     * This method matches that response array contains provided array.
-     *
-     * Examples:
-     *
-     * ``` php
-     * <?php
-     * // response: {name: john, email: john@gmail.com}
-     * $I->seeResponseContainsJson(array('name' => 'john'));
-     *
-     * // response {user: john, profile: { email: john@gmail.com }}
-     * $I->seeResponseContainsJson(array('email' => 'john@gmail.com'));
-     *
-     * ?>
-     * ```
-     *
-     * This method recursively checks if one array can be found inside of another.
-     *
-     * @param array $json
-     * @part json
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::seeResponseContainsJson()
-     */
-    public function canSeeResponseContainsJson($json = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseContainsJson', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks whether the last JSON response contains provided array.
-     * The response is converted to array with json_decode($response, true)
-     * Thus, JSON is represented by associative array.
-     * This method matches that response array contains provided array.
-     *
-     * Examples:
-     *
-     * ``` php
-     * <?php
-     * // response: {name: john, email: john@gmail.com}
-     * $I->seeResponseContainsJson(array('name' => 'john'));
-     *
-     * // response {user: john, profile: { email: john@gmail.com }}
-     * $I->seeResponseContainsJson(array('email' => 'john@gmail.com'));
-     *
-     * ?>
-     * ```
-     *
-     * This method recursively checks if one array can be found inside of another.
-     *
-     * @param array $json
-     * @part json
-     * @see \Codeception\Module\REST::seeResponseContainsJson()
-     */
-    public function seeResponseContainsJson($json = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseContainsJson', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Returns current response so that it can be used in next scenario steps.
-     *
-     * Example:
-     *
-     * ``` php
-     * <?php
-     * $user_id = $I->grabResponse();
-     * $I->sendPUT('/user', array('id' => $user_id, 'name' => 'davert'));
-     * ?>
-     * ```
-     *
-     * @version 1.1
-     * @return string
-     * @part json
-     * @part xml
-     * @see \Codeception\Module\REST::grabResponse()
-     */
-    public function grabResponse() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabResponse', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Returns data from the current JSON response using [JSONPath](http://goessner.net/articles/JsonPath/) as selector.
-     * JsonPath is XPath equivalent for querying Json structures.
-     * Try your JsonPath expressions [online](http://jsonpath.curiousconcept.com/).
-     * Even for a single value an array is returned.
-     *
-     * This method **require [`flow/jsonpath` > 0.2](https://github.com/FlowCommunications/JSONPath/) library to be installed**.
-     *
-     * Example:
-     *
-     * ``` php
-     * <?php
-     * // match the first `user.id` in json
-     * $firstUserId = $I->grabDataFromResponseByJsonPath('$..users[0].id');
-     * $I->sendPUT('/user', array('id' => $firstUserId[0], 'name' => 'davert'));
-     * ?>
-     * ```
-     *
-     * @param string $jsonPath
-     * @return array Array of matching items
-     * @version 2.0.9
-     * @throws \Exception
-     * @part json
-     * @see \Codeception\Module\REST::grabDataFromResponseByJsonPath()
-     */
-    public function grabDataFromResponseByJsonPath($jsonPath) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabDataFromResponseByJsonPath', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if json structure in response matches the xpath provided.
-     * JSON is not supposed to be checked against XPath, yet it can be converted to xml and used with XPath.
-     * This assertion allows you to check the structure of response json.
-     *     *
-     * ```json
-     *   { "store": {
-     *       "book": [
-     *         { "category": "reference",
-     *           "author": "Nigel Rees",
-     *           "title": "Sayings of the Century",
-     *           "price": 8.95
-     *         },
-     *         { "category": "fiction",
-     *           "author": "Evelyn Waugh",
-     *           "title": "Sword of Honour",
-     *           "price": 12.99
-     *         }
-     *    ],
-     *       "bicycle": {
-     *         "color": "red",
-     *         "price": 19.95
-     *       }
-     *     }
-     *   }
-     * ```
-     *
-     * ```php
-     * <?php
-     * // at least one book in store has author
-     * $I->seeResponseJsonMatchesXpath('//store/book/author');
-     * // first book in store has author
-     * $I->seeResponseJsonMatchesXpath('//store/book[1]/author');
-     * // at least one item in store has price
-     * $I->seeResponseJsonMatchesXpath('/store//price');
-     * ?>
-     * ```
-     * @part json
-     * @version 2.0.9
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::seeResponseJsonMatchesXpath()
-     */
-    public function canSeeResponseJsonMatchesXpath($xpath) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseJsonMatchesXpath', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if json structure in response matches the xpath provided.
-     * JSON is not supposed to be checked against XPath, yet it can be converted to xml and used with XPath.
-     * This assertion allows you to check the structure of response json.
-     *     *
-     * ```json
-     *   { "store": {
-     *       "book": [
-     *         { "category": "reference",
-     *           "author": "Nigel Rees",
-     *           "title": "Sayings of the Century",
-     *           "price": 8.95
-     *         },
-     *         { "category": "fiction",
-     *           "author": "Evelyn Waugh",
-     *           "title": "Sword of Honour",
-     *           "price": 12.99
-     *         }
-     *    ],
-     *       "bicycle": {
-     *         "color": "red",
-     *         "price": 19.95
-     *       }
-     *     }
-     *   }
-     * ```
-     *
-     * ```php
-     * <?php
-     * // at least one book in store has author
-     * $I->seeResponseJsonMatchesXpath('//store/book/author');
-     * // first book in store has author
-     * $I->seeResponseJsonMatchesXpath('//store/book[1]/author');
-     * // at least one item in store has price
-     * $I->seeResponseJsonMatchesXpath('/store//price');
-     * ?>
-     * ```
-     * @part json
-     * @version 2.0.9
-     * @see \Codeception\Module\REST::seeResponseJsonMatchesXpath()
-     */
-    public function seeResponseJsonMatchesXpath($xpath) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseJsonMatchesXpath', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if json structure in response matches [JsonPath](http://goessner.net/articles/JsonPath/).
-     * JsonPath is XPath equivalent for querying Json structures.
-     * Try your JsonPath expressions [online](http://jsonpath.curiousconcept.com/).
-     * This assertion allows you to check the structure of response json.
-     *
-     * This method **require [`flow/jsonpath` > 0.2](https://github.com/FlowCommunications/JSONPath/) library to be installed**.
-     *
-     * ```json
-     *   { "store": {
-     *       "book": [
-     *         { "category": "reference",
-     *           "author": "Nigel Rees",
-     *           "title": "Sayings of the Century",
-     *           "price": 8.95
-     *         },
-     *         { "category": "fiction",
-     *           "author": "Evelyn Waugh",
-     *           "title": "Sword of Honour",
-     *           "price": 12.99
-     *         }
-     *    ],
-     *       "bicycle": {
-     *         "color": "red",
-     *         "price": 19.95
-     *       }
-     *     }
-     *   }
-     * ```
-     *
-     * ```php
-     * <?php
-     * // at least one book in store has author
-     * $I->seeResponseJsonMatchesJsonPath('$.store.book[*].author');
-     * // first book in store has author
-     * $I->seeResponseJsonMatchesJsonPath('$.store.book[0].author');
-     * // at least one item in store has price
-     * $I->seeResponseJsonMatchesJsonPath('$.store..price');
-     * ?>
-     * ```
-     *
-     * @part json
-     * @version 2.0.9
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::seeResponseJsonMatchesJsonPath()
-     */
-    public function canSeeResponseJsonMatchesJsonPath($jsonPath) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseJsonMatchesJsonPath', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if json structure in response matches [JsonPath](http://goessner.net/articles/JsonPath/).
-     * JsonPath is XPath equivalent for querying Json structures.
-     * Try your JsonPath expressions [online](http://jsonpath.curiousconcept.com/).
-     * This assertion allows you to check the structure of response json.
-     *
-     * This method **require [`flow/jsonpath` > 0.2](https://github.com/FlowCommunications/JSONPath/) library to be installed**.
-     *
-     * ```json
-     *   { "store": {
-     *       "book": [
-     *         { "category": "reference",
-     *           "author": "Nigel Rees",
-     *           "title": "Sayings of the Century",
-     *           "price": 8.95
-     *         },
-     *         { "category": "fiction",
-     *           "author": "Evelyn Waugh",
-     *           "title": "Sword of Honour",
-     *           "price": 12.99
-     *         }
-     *    ],
-     *       "bicycle": {
-     *         "color": "red",
-     *         "price": 19.95
-     *       }
-     *     }
-     *   }
-     * ```
-     *
-     * ```php
-     * <?php
-     * // at least one book in store has author
-     * $I->seeResponseJsonMatchesJsonPath('$.store.book[*].author');
-     * // first book in store has author
-     * $I->seeResponseJsonMatchesJsonPath('$.store.book[0].author');
-     * // at least one item in store has price
-     * $I->seeResponseJsonMatchesJsonPath('$.store..price');
-     * ?>
-     * ```
-     *
-     * @part json
-     * @version 2.0.9
-     * @see \Codeception\Module\REST::seeResponseJsonMatchesJsonPath()
-     */
-    public function seeResponseJsonMatchesJsonPath($jsonPath) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseJsonMatchesJsonPath', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Opposite to seeResponseJsonMatchesJsonPath
-     *
-     * @param array $jsonPath
-     * @part json
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::dontSeeResponseJsonMatchesJsonPath()
-     */
-    public function cantSeeResponseJsonMatchesJsonPath($jsonPath) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseJsonMatchesJsonPath', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Opposite to seeResponseJsonMatchesJsonPath
-     *
-     * @param array $jsonPath
-     * @part json
-     * @see \Codeception\Module\REST::dontSeeResponseJsonMatchesJsonPath()
-     */
-    public function dontSeeResponseJsonMatchesJsonPath($jsonPath) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeResponseJsonMatchesJsonPath', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Opposite to seeResponseContainsJson
-     *
-     * @part json
-     * @param array $json
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::dontSeeResponseContainsJson()
-     */
-    public function cantSeeResponseContainsJson($json = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseContainsJson', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Opposite to seeResponseContainsJson
-     *
-     * @part json
-     * @param array $json
-     * @see \Codeception\Module\REST::dontSeeResponseContainsJson()
-     */
-    public function dontSeeResponseContainsJson($json = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeResponseContainsJson', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that Json matches provided types.
-     * In case you don't know the actual values of JSON data returned you can match them by type.
-     * Starts check with a root element. If JSON data is array it will check the first element of an array.
-     * You can specify the path in the json which should be checked with JsonPath
-     *
-     * Basic example:
-     *
-     * ```php
-     * <?php
-     * // {'user_id': 1, 'name': 'davert', 'is_active': false}
-     * $I->seeResponseMatchesJsonType([
-     *      'user_id' => 'integer',
-     *      'name' => 'string|null',
-     *      'is_active' => 'boolean'
-     * ]);
-     *
-     * // narrow down matching with JsonPath:
-     * // {"users": [{ "name": "davert"}, {"id": 1}]}
-     * $I->seeResponseMatchesJsonType(['name' => 'string'], '$.users[0]');
-     * ?>
-     * ```
-     *
-     * In this case you can match that record contains fields with data types you expected.
-     * The list of possible data types:
-     *
-     * * string
-     * * integer
-     * * float
-     * * array (json object is array as well)
-     * * boolean
-     *
-     * You can also use nested data type structures:
-     *
-     * ```php
-     * <?php
-     * // {'user_id': 1, 'name': 'davert', 'company': {'name': 'Codegyre'}}
-     * $I->seeResponseMatchesJsonType([
-     *      'user_id' => 'integer|string', // multiple types
-     *      'company' => ['name' => 'string']
-     * ]);
-     * ?>
-     * ```
-     *
-     * You can also apply filters to check values. Filter can be applied with `:` char after the type declatation.
-     *
-     * Here is the list of possible filters:
-     *
-     * * `integer:>{val}` - checks that integer is greater than {val} (works with float and string types too).
-     * * `integer:<{val}` - checks that integer is lower than {val} (works with float and string types too).
-     * * `string:url` - checks that value is valid url.
-     * * `string:date` - checks that value is date in JavaScript format: https://weblog.west-wind.com/posts/2014/Jan/06/JavaScript-JSON-Date-Parsing-and-real-Dates
-     * * `string:email` - checks that value is a valid email according to http://emailregex.com/
-     * * `string:regex({val})` - checks that string matches a regex provided with {val}
-     *
-     * This is how filters can be used:
-     *
-     * ```php
-     * <?php
-     * // {'user_id': 1, 'email' => 'davert@codeception.com'}
-     * $I->seeResponseMatchesJsonType([
-     *      'user_id' => 'string:>0:<1000', // multiple filters can be used
-     *      'email' => 'string:regex(~\@~)' // we just check that @ char is included
-     * ]);
-     *
-     * // {'user_id': '1'}
-     * $I->seeResponseMatchesJsonType([
-     *      'user_id' => 'string:>0', // works with strings as well
-     * }
-     * ?>
-     * ```
-     *
-     * You can also add custom filters y accessing `JsonType::addCustomFilter` method.
-     * See [JsonType reference](http://codeception.com/docs/reference/JsonType).
-     *
-     * @part json
-     * @version 2.1.3
-     * @param array $jsonType
-     * @param string $jsonPath
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::seeResponseMatchesJsonType()
-     */
-    public function canSeeResponseMatchesJsonType($jsonType, $jsonPath = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseMatchesJsonType', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that Json matches provided types.
-     * In case you don't know the actual values of JSON data returned you can match them by type.
-     * Starts check with a root element. If JSON data is array it will check the first element of an array.
-     * You can specify the path in the json which should be checked with JsonPath
-     *
-     * Basic example:
-     *
-     * ```php
-     * <?php
-     * // {'user_id': 1, 'name': 'davert', 'is_active': false}
-     * $I->seeResponseMatchesJsonType([
-     *      'user_id' => 'integer',
-     *      'name' => 'string|null',
-     *      'is_active' => 'boolean'
-     * ]);
-     *
-     * // narrow down matching with JsonPath:
-     * // {"users": [{ "name": "davert"}, {"id": 1}]}
-     * $I->seeResponseMatchesJsonType(['name' => 'string'], '$.users[0]');
-     * ?>
-     * ```
-     *
-     * In this case you can match that record contains fields with data types you expected.
-     * The list of possible data types:
-     *
-     * * string
-     * * integer
-     * * float
-     * * array (json object is array as well)
-     * * boolean
-     *
-     * You can also use nested data type structures:
-     *
-     * ```php
-     * <?php
-     * // {'user_id': 1, 'name': 'davert', 'company': {'name': 'Codegyre'}}
-     * $I->seeResponseMatchesJsonType([
-     *      'user_id' => 'integer|string', // multiple types
-     *      'company' => ['name' => 'string']
-     * ]);
-     * ?>
-     * ```
-     *
-     * You can also apply filters to check values. Filter can be applied with `:` char after the type declatation.
-     *
-     * Here is the list of possible filters:
-     *
-     * * `integer:>{val}` - checks that integer is greater than {val} (works with float and string types too).
-     * * `integer:<{val}` - checks that integer is lower than {val} (works with float and string types too).
-     * * `string:url` - checks that value is valid url.
-     * * `string:date` - checks that value is date in JavaScript format: https://weblog.west-wind.com/posts/2014/Jan/06/JavaScript-JSON-Date-Parsing-and-real-Dates
-     * * `string:email` - checks that value is a valid email according to http://emailregex.com/
-     * * `string:regex({val})` - checks that string matches a regex provided with {val}
-     *
-     * This is how filters can be used:
-     *
-     * ```php
-     * <?php
-     * // {'user_id': 1, 'email' => 'davert@codeception.com'}
-     * $I->seeResponseMatchesJsonType([
-     *      'user_id' => 'string:>0:<1000', // multiple filters can be used
-     *      'email' => 'string:regex(~\@~)' // we just check that @ char is included
-     * ]);
-     *
-     * // {'user_id': '1'}
-     * $I->seeResponseMatchesJsonType([
-     *      'user_id' => 'string:>0', // works with strings as well
-     * }
-     * ?>
-     * ```
-     *
-     * You can also add custom filters y accessing `JsonType::addCustomFilter` method.
-     * See [JsonType reference](http://codeception.com/docs/reference/JsonType).
-     *
-     * @part json
-     * @version 2.1.3
-     * @param array $jsonType
-     * @param string $jsonPath
-     * @see \Codeception\Module\REST::seeResponseMatchesJsonType()
-     */
-    public function seeResponseMatchesJsonType($jsonType, $jsonPath = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseMatchesJsonType', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Opposite to `seeResponseMatchesJsonType`.
-     *
-     * @part json
-     * @see seeResponseMatchesJsonType
-     * @param $jsonType jsonType structure
-     * @param null $jsonPath optionally set specific path to structure with JsonPath
-     * @version 2.1.3
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::dontSeeResponseMatchesJsonType()
-     */
-    public function cantSeeResponseMatchesJsonType($jsonType, $jsonPath = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseMatchesJsonType', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Opposite to `seeResponseMatchesJsonType`.
-     *
-     * @part json
-     * @see seeResponseMatchesJsonType
-     * @param $jsonType jsonType structure
-     * @param null $jsonPath optionally set specific path to structure with JsonPath
-     * @version 2.1.3
-     * @see \Codeception\Module\REST::dontSeeResponseMatchesJsonType()
-     */
-    public function dontSeeResponseMatchesJsonType($jsonType, $jsonPath = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeResponseMatchesJsonType', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if response is exactly the same as provided.
-     *
-     * @part json
-     * @part xml
-     * @param $response
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::seeResponseEquals()
-     */
-    public function canSeeResponseEquals($expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseEquals', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if response is exactly the same as provided.
-     *
-     * @part json
-     * @part xml
-     * @param $response
-     * @see \Codeception\Module\REST::seeResponseEquals()
-     */
-    public function seeResponseEquals($expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks response code equals to provided value.
-     *
-     * ```php
-     * <?php
-     * $I->seeResponseCodeIs(200);
-     *
-     * // preferred to use \Codeception\Util\HttpCode
-     * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
-     *
-     * @part json
-     * @part xml
-     * @param $code
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::seeResponseCodeIs()
-     */
-    public function canSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIs', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks response code equals to provided value.
-     *
-     * ```php
-     * <?php
-     * $I->seeResponseCodeIs(200);
-     *
-     * // preferred to use \Codeception\Util\HttpCode
-     * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
-     *
-     * @part json
-     * @part xml
-     * @param $code
-     * @see \Codeception\Module\REST::seeResponseCodeIs()
-     */
-    public function seeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIs', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that response code is not equal to provided value.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeResponseCodeIs(200);
-     *
-     * // preferred to use \Codeception\Util\HttpCode
-     * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
-     *
-     * @part json
-     * @part xml
-     * @param $code
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\REST::dontSeeResponseCodeIs()
-     */
-    public function cantSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseCodeIs', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that response code is not equal to provided value.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeResponseCodeIs(200);
-     *
-     * // preferred to use \Codeception\Util\HttpCode
-     * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
-     *
-     * @part json
-     * @part xml
-     * @param $code
-     * @see \Codeception\Module\REST::dontSeeResponseCodeIs()
-     */
-    public function dontSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeResponseCodeIs', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Prevents automatic redirects to be followed by the client
-     *
-     * ```php
-     * <?php
-     * $I->stopFollowingRedirects();
-     * ```
-     *
-     * @part xml
-     * @part json
-     * @see \Codeception\Module\REST::stopFollowingRedirects()
-     */
-    public function stopFollowingRedirects() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('stopFollowingRedirects', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Enables automatic redirects to be followed by the client
-     *
-     * ```php
-     * <?php
-     * $I->startFollowingRedirects();
-     * ```
-     *
-     * @part xml
-     * @part json
-     * @see \Codeception\Module\REST::startFollowingRedirects()
-     */
-    public function startFollowingRedirects() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('startFollowingRedirects', func_get_args()));
-    }
-}
diff --git a/tests/codeception/_support/_generated/FunctionalTesterActions.php b/tests/codeception/_support/_generated/FunctionalTesterActions.php
deleted file mode 100644
index 0fc6f7626..000000000
--- a/tests/codeception/_support/_generated/FunctionalTesterActions.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php  //[STAMP] e88575298465f35c4ba48944693fdc61
-namespace _generated;
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-use Codeception\Module\Db;
-
-trait FunctionalTesterActions
-{
-    /**
-     * @return \Codeception\Scenario
-     */
-    abstract protected function getScenario();
-
-    
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Inserts an SQL record into a database. This record will be erased after the test.
-     *
-     * ``` php
-     * <?php
-     * $I->haveInDatabase('users', array('name' => 'miles', 'email' => 'miles@davis.com'));
-     * ?>
-     * ```
-     *
-     * @param string $table
-     * @param array $data
-     *
-     * @return integer $id
-     * @see \Codeception\Module\Db::haveInDatabase()
-     */
-    public function haveInDatabase($table, $data) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveInDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that a row with the given column values exists.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if no such user found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Db::seeInDatabase()
-     */
-    public function canSeeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInDatabase', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that a row with the given column values exists.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if no such user found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * @see \Codeception\Module\Db::seeInDatabase()
-     */
-    public function seeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that the given number of records were found in the database.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumRecords(1, 'users', ['name' => 'davert'])
-     * ?>
-     * ```
-     *
-     * @param int $expectedNumber Expected number
-     * @param string $table Table name
-     * @param array $criteria Search criteria [Optional]
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Db::seeNumRecords()
-     */
-    public function canSeeNumRecords($expectedNumber, $table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumRecords', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that the given number of records were found in the database.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumRecords(1, 'users', ['name' => 'davert'])
-     * ?>
-     * ```
-     *
-     * @param int $expectedNumber Expected number
-     * @param string $table Table name
-     * @param array $criteria Search criteria [Optional]
-     * @see \Codeception\Module\Db::seeNumRecords()
-     */
-    public function seeNumRecords($expectedNumber, $table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumRecords', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Effect is opposite to ->seeInDatabase
-     *
-     * Asserts that there is no record with the given column values in a database.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if such user was found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Db::dontSeeInDatabase()
-     */
-    public function cantSeeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInDatabase', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Effect is opposite to ->seeInDatabase
-     *
-     * Asserts that there is no record with the given column values in a database.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if such user was found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * @see \Codeception\Module\Db::dontSeeInDatabase()
-     */
-    public function dontSeeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Fetches a single column value from a database.
-     * Provide table name, desired column and criteria.
-     *
-     * ``` php
-     * <?php
-     * $mail = $I->grabFromDatabase('users', 'email', array('name' => 'Davert'));
-     * ```
-     *
-     * @param string $table
-     * @param string $column
-     * @param array $criteria
-     *
-     * @return mixed
-     * @see \Codeception\Module\Db::grabFromDatabase()
-     */
-    public function grabFromDatabase($table, $column, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Returns the number of rows in a database
-     *
-     * @param string $table    Table name
-     * @param array  $criteria Search criteria [Optional]
-     *
-     * @return int
-     * @see \Codeception\Module\Db::grabNumRecords()
-     */
-    public function grabNumRecords($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabNumRecords', func_get_args()));
-    }
-}
diff --git a/tests/codeception/_support/_generated/UnitTesterActions.php b/tests/codeception/_support/_generated/UnitTesterActions.php
deleted file mode 100644
index 0fc6e8350..000000000
--- a/tests/codeception/_support/_generated/UnitTesterActions.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php  //[STAMP] e88575298465f35c4ba48944693fdc61
-namespace _generated;
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-use Codeception\Module\Db;
-
-trait UnitTesterActions
-{
-    /**
-     * @return \Codeception\Scenario
-     */
-    abstract protected function getScenario();
-
-    
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Inserts an SQL record into a database. This record will be erased after the test.
-     *
-     * ``` php
-     * <?php
-     * $I->haveInDatabase('users', array('name' => 'miles', 'email' => 'miles@davis.com'));
-     * ?>
-     * ```
-     *
-     * @param string $table
-     * @param array $data
-     *
-     * @return integer $id
-     * @see \Codeception\Module\Db::haveInDatabase()
-     */
-    public function haveInDatabase($table, $data) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveInDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that a row with the given column values exists.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if no such user found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Db::seeInDatabase()
-     */
-    public function canSeeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInDatabase', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that a row with the given column values exists.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if no such user found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * @see \Codeception\Module\Db::seeInDatabase()
-     */
-    public function seeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that the given number of records were found in the database.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumRecords(1, 'users', ['name' => 'davert'])
-     * ?>
-     * ```
-     *
-     * @param int $expectedNumber Expected number
-     * @param string $table Table name
-     * @param array $criteria Search criteria [Optional]
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Db::seeNumRecords()
-     */
-    public function canSeeNumRecords($expectedNumber, $table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumRecords', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that the given number of records were found in the database.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumRecords(1, 'users', ['name' => 'davert'])
-     * ?>
-     * ```
-     *
-     * @param int $expectedNumber Expected number
-     * @param string $table Table name
-     * @param array $criteria Search criteria [Optional]
-     * @see \Codeception\Module\Db::seeNumRecords()
-     */
-    public function seeNumRecords($expectedNumber, $table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumRecords', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Effect is opposite to ->seeInDatabase
-     *
-     * Asserts that there is no record with the given column values in a database.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if such user was found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Db::dontSeeInDatabase()
-     */
-    public function cantSeeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInDatabase', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Effect is opposite to ->seeInDatabase
-     *
-     * Asserts that there is no record with the given column values in a database.
-     * Provide table name and column values.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInDatabase('users', array('name' => 'Davert', 'email' => 'davert@mail.com'));
-     * ```
-     * Fails if such user was found.
-     *
-     * @param string $table
-     * @param array $criteria
-     * @see \Codeception\Module\Db::dontSeeInDatabase()
-     */
-    public function dontSeeInDatabase($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Fetches a single column value from a database.
-     * Provide table name, desired column and criteria.
-     *
-     * ``` php
-     * <?php
-     * $mail = $I->grabFromDatabase('users', 'email', array('name' => 'Davert'));
-     * ```
-     *
-     * @param string $table
-     * @param string $column
-     * @param array $criteria
-     *
-     * @return mixed
-     * @see \Codeception\Module\Db::grabFromDatabase()
-     */
-    public function grabFromDatabase($table, $column, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromDatabase', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Returns the number of rows in a database
-     *
-     * @param string $table    Table name
-     * @param array  $criteria Search criteria [Optional]
-     *
-     * @return int
-     * @see \Codeception\Module\Db::grabNumRecords()
-     */
-    public function grabNumRecords($table, $criteria = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabNumRecords', func_get_args()));
-    }
-}
diff --git a/tests/codeception/codeception.dist.yml b/tests/codeception/codeception.dist.yml
deleted file mode 100644
index b12ddc09e..000000000
--- a/tests/codeception/codeception.dist.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-actor: Tester
-paths:
-    tests: tests
-    log: _output
-    data: _data
-    helpers: _support
-settings:
-    bootstrap: _bootstrap.php
-    colors: true
-    memory_limit: 1024M
-modules:
-    enabled:
-        - Db:
-            dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
-            user: 'fhcomplete'
-            password: 'fhcomplete'
-            dump: _data/dump.sql
-            populate: true
-            cleanup: false
-            reconnect: false
-coverage:
-    enabled: true
-    include:
-        - application/*
-    exclude:
-        - application/cache/*
-        - application/logs/*
\ No newline at end of file
diff --git a/tests/codeception/tests/acceptance.suite.yml.dist b/tests/codeception/tests/acceptance.suite.yml.dist
deleted file mode 100644
index 643553186..000000000
--- a/tests/codeception/tests/acceptance.suite.yml.dist
+++ /dev/null
@@ -1,21 +0,0 @@
-# Codeception Test Suite Configuration
-
-# suite for acceptance tests.
-# perform tests in browser using the WebDriver or PhpBrowser.
-# If you need both WebDriver and PHPBrowser tests - create a separate suite.
-
-class_name: AcceptanceTester
-modules:
-    enabled:
-        - Db
-        - PhpBrowser:
-            url: 'http://admin:1q2w3@test.fhcomplete.org/build/'
-    config:
-        Db:
-            dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
-            user: 'fhcomplete'
-            password: 'fhcomplete'
-            dump: _data/dump.sql
-            populate: true
-            cleanup: false
-            reconnect: false
\ No newline at end of file
diff --git a/tests/codeception/tests/acceptance/CISLoginPage.php b/tests/codeception/tests/acceptance/CISLoginPage.php
deleted file mode 100644
index a1f394c75..000000000
--- a/tests/codeception/tests/acceptance/CISLoginPage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php 
-$I = new AcceptanceTester($scenario);
-$I->wantTo('CIS Startseite Testen');
-//$I->amOnPage('/cis/index.html');
-//$I->see('Powered by FH Complete');
-?>
\ No newline at end of file
diff --git a/tests/codeception/tests/acceptance/VileSciSearchPersonCept.php b/tests/codeception/tests/acceptance/VileSciSearchPersonCept.php
deleted file mode 100644
index 6e5d794b8..000000000
--- a/tests/codeception/tests/acceptance/VileSciSearchPersonCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php 
-
-$I = new AcceptanceTester($scenario);
-$I->wantTo('Test the Search-Feature of VileSci');
-$I->amOnPage('/vilesci/personen/suche.php');
-$I->lookForwardTo('Personensuche');
-$I->seeElement('input[name="searchstr"]');
-$I->seeElement('input[type=submit][value=Suchen]');
-$I->fillField('searchstr', 'Vicenta');
-$I->click('Suchen');
-$I->see('McKenzie');
\ No newline at end of file
diff --git a/tests/codeception/tests/acceptance/VileSciStartPage.php b/tests/codeception/tests/acceptance/VileSciStartPage.php
deleted file mode 100644
index 33117fb75..000000000
--- a/tests/codeception/tests/acceptance/VileSciStartPage.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php 
-$I = new AcceptanceTester($scenario);
-$I->wantTo('test the Startpage of VileSci');
-
-$I->wantTo('test this over vilesci/index.php');
-$I->amOnPage('/vilesci/index.php');
-$I->See('This application works only with');
-$I->seeElement('#frameset-vilesci');
-
-$I->wantTo('and now over index.ci.php');
-$I->amOnPage('/index.ci.php');
-$I->See('This application works only with');
-$I->seeElement('#frameset-vilesci');
-
-$I->wantTo('test the top menu');
-$I->amOnPage('/vilesci/top.php');
-$I->seeElement('.logo');
-
-$I->wantTo('test the left nav-frame');
-$I->amOnPage('/vilesci/left.php');
-$I->seeElement('.left_nav');
-
-$I->wantTo('test the main-frame');
-$I->amOnPage('/vilesci/main.php');
-$I->seeElement('img');
-?>
diff --git a/tests/codeception/tests/acceptance/_bootstrap.php b/tests/codeception/tests/acceptance/_bootstrap.php
deleted file mode 100644
index 8a8855580..000000000
--- a/tests/codeception/tests/acceptance/_bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// Here you can initialize variables that will be available to your tests
diff --git a/tests/codeception/tests/api.suite.yml.dist b/tests/codeception/tests/api.suite.yml.dist
deleted file mode 100644
index 4e8f550e6..000000000
--- a/tests/codeception/tests/api.suite.yml.dist
+++ /dev/null
@@ -1,20 +0,0 @@
-class_name: ApiTester
-modules:
-    enabled:
-        - Db
-        - REST:
-            # API URL
-            url: 'http://admin:1q2w3@test.fhcomplete.org/build/index.ci.php/api/'
-            # Can also be a framework module name
-            depends: PhpBrowser
-            # Limits PhpBrowser to JSON or XML
-            part: Json
-    config:
-        Db:
-            dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
-            user: 'fhcomplete'
-            password: 'fhcomplete'
-            dump: _data/dump.sql
-            populate: true
-            cleanup: false
-            reconnect: false
\ No newline at end of file
diff --git a/tests/codeception/tests/api/_bootstrap.php b/tests/codeception/tests/api/_bootstrap.php
deleted file mode 100644
index 8a8855580..000000000
--- a/tests/codeception/tests/api/_bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// Here you can initialize variables that will be available to your tests
diff --git a/tests/codeception/tests/api/generate.php b/tests/codeception/tests/api/generate.php
deleted file mode 100644
index 098425c1d..000000000
--- a/tests/codeception/tests/api/generate.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-	
-	/**
-	 * Recursively finds all files in the given folder
-	 */
-	function lstFiles($dir, $lst = null)
-	{
-		$retLst = array();
-		
-		if ($lst == null)
-			$lst = scandir($dir);
-		
-		$lst = array_diff($lst, array('..', '.'));
-		
-		foreach ($lst as $el)
-		{
-			if (is_dir($dir.'/'.$el))
-			{
-				$retLst = array_merge($retLst, lstFiles($dir.'/'.$el, scandir($dir.'/'.$el)));
-			}
-			else
-			{
-				array_push($retLst, $dir.'/'.$el);
-			}
-		}
-		
-		return $retLst;
-	}
-	
-	// Get a list of every file present in the given folder
-	$lstFiles = lstFiles('../../../../application/controllers/api/v1');
-	
-	// Automatically detects the line ending character
-	ini_set('auto_detect_line_endings', true);
-	// Gets the template of the header of the test file
-	if (($fileTplHead = file_get_contents('./template_head.tpl')) === false)
-		die('Problems loading template_head.tpl');
-	// Gets the template of the body of the test file
-	if (($fileTplCall = file_get_contents('./template_call.tpl')) === false)
-		die('Problems loading template_call.tpl');
-	
-	// Loops the list of files
-	foreach($lstFiles as $file)
-	{
-		// Open the file for reading
-		if (($fileHandle = fopen($file, 'r')) !== false)
-		{
-			$name = ''; // Name of the test
-			$functions = array(); // List of functions
-			$functionsCounter = -1; // Functions counter
-			
-			// Reads from the file line by line
-			while (($line = fgets($fileHandle, 4096)) !== false)
-			{
-				// Drops the spaces at the beginning and at the and of the line
-				$line = trim($line);
-				
-				// If it is the line that declare the class
-				if (strpos($line, 'class') !== false)
-				{
-					$name = explode(' ', $line)[1];
-				}
-				
-				// If it is a line that declare a function
-				if (strpos($line, 'public function get') !== false)
-				{
-					$functionsCounter++;
-					$functions[$functionsCounter] = array();
-					$functions[$functionsCounter]['name'] = trim(preg_replace('/^get/i', ' ', explode(' ', $line)[2]));
-					$functions[$functionsCounter]['name'] = trim(str_replace('()', ' ', $functions[$functionsCounter]['name']));
-					$functions[$functionsCounter]['parameters'] = array();
-				}
-				
-				// If it is a line that get a parameter
-				if (strpos($line, 'this->get') !== false)
-				{
-					$parameters = explode('\'', $line);
-					if (count($parameters) >= 2)
-					{
-						$functions[$functionsCounter]['parameters'][] = $parameters[1];
-					}
-					else
-					{
-						$parameters = explode('"', $line);
-						if (count($parameters) >= 2)
-						{
-							$functions[$functionsCounter]['parameters'][] = $parameters[1];
-						}
-					}
-				}
-			}
-			
-			fclose($fileHandle); // Closing the file pointer is always a good thing
-			
-			// Gets the path of the api
-			$apiPath = trim(str_replace('../../../../application/controllers/api/', ' ', $file));
-			$apiPath = substr($apiPath, 0, strrpos($apiPath, '/') + 1);
-			// Prefix of the test file name given by the parent folder
-			$namePrefix = trim(str_replace('v1/', ' ', $apiPath));
-			$namePrefix = ucfirst(trim(str_replace('/', ' ', $namePrefix)));
-			
-			// If if is not a fake
-			if (trim($name) != '')
-			{
-				// Where to create the test files
-				$testDir = './v1/';
-				// If the test file is not already present
-				if (!file_exists($testDir.$namePrefix.$name.'Cept.php'))
-				{
-					// Create and open the test file for writing
-					if (($fileTestHandle = fopen($testDir.$namePrefix.$name.'Cept.php', 'w')) !== false)
-					{
-						// Lst of function to place in the header
-						$strLstFunctions = '';
-						for($i = 0; $i < count($functions); $i++)
-						{
-							$function = $functions[$i];
-							if ($i == 0)
-							{
-								$strLstFunctions .= $apiPath.$name.'/'.': ';
-							}
-							
-							$strLstFunctions .= $function['name'];
-							
-							if ($i < count($functions) - 1)
-							{
-								$strLstFunctions .= ' ';
-							}
-						}
-						
-						// Create the test file header using the template
-						$strToWrite = str_replace('_CALL_', $strLstFunctions, $fileTplHead);
-						// Writes the header into the test file
-						if (fwrite($fileTestHandle, $strToWrite."\n") === false)
-						{
-							echo 'Error!!!';
-						}
-						
-						// For every function create a call
-						foreach($functions as $function)
-						{
-							// Gets a list of parameters
-							$strLstParameters = '';
-							for($i = 0; $i < count($function['parameters']); $i++)
-							{
-								$parameter = $function['parameters'][$i];
-								$strLstParameters .= '"'.$parameter.'" => "1"';
-								if ($i < count($function['parameters']) - 1)
-								{
-									$strLstParameters .= ", ";
-								}
-							}
-							// Create the call using the template
-							$strToWrite = str_replace('_CALL_', $apiPath.$name.'/'.$function['name'], $fileTplCall);
-							$strToWrite = str_replace('_PARAMETERS_', $strLstParameters, $strToWrite);
-							// Write it into the test file
-							if (fwrite($fileTestHandle, $strToWrite."\n") === false)
-							{
-								echo 'Error!!!';
-							}
-						}
-						
-						fclose($fileTestHandle); // As usual
-					}
-					else
-					{
-						echo "Error opening file: ".$testDir.$name.'Cept.php'."\n";
-					}
-				}
-				else
-				{
-					echo $testDir.$name."Cept.php is already present\n";
-				}
-			}
-		}
-	}
-	
-?>
\ No newline at end of file
diff --git a/tests/codeception/tests/api/template_call.tpl b/tests/codeception/tests/api/template_call.tpl
deleted file mode 100644
index 1a66009bd..000000000
--- a/tests/codeception/tests/api/template_call.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-$I->sendGET("_CALL_", array(_PARAMETERS_));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
\ No newline at end of file
diff --git a/tests/codeception/tests/api/template_head.tpl b/tests/codeception/tests/api/template_head.tpl
deleted file mode 100644
index f0a72ba64..000000000
--- a/tests/codeception/tests/api/template_head.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call _CALL_");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
\ No newline at end of file
diff --git a/tests/codeception/tests/api/v1/AccountingAufteilungCept.php b/tests/codeception/tests/api/v1/AccountingAufteilungCept.php
deleted file mode 100644
index e25bb2bb2..000000000
--- a/tests/codeception/tests/api/v1/AccountingAufteilungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Aufteilung/: Aufteilung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Aufteilung/Aufteilung", array("aufteilung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingBestelldetailCept.php b/tests/codeception/tests/api/v1/AccountingBestelldetailCept.php
deleted file mode 100644
index 129b1fe77..000000000
--- a/tests/codeception/tests/api/v1/AccountingBestelldetailCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Bestelldetail/: Bestelldetail");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Bestelldetail/Bestelldetail", array("bestelldetail_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingBestelldetailtagCept.php b/tests/codeception/tests/api/v1/AccountingBestelldetailtagCept.php
deleted file mode 100644
index 44047ccf8..000000000
--- a/tests/codeception/tests/api/v1/AccountingBestelldetailtagCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Bestelldetailtag/: Bestelldetailtag");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Bestelldetailtag/Bestelldetailtag", array("bestelldetail_id" => "1", "tag" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingBestellstatusCept.php b/tests/codeception/tests/api/v1/AccountingBestellstatusCept.php
deleted file mode 100644
index f6bd8d835..000000000
--- a/tests/codeception/tests/api/v1/AccountingBestellstatusCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Bestellstatus/: Bestellstatus");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Bestellstatus/Bestellstatus", array("bestellstatus_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingBestellungCept.php b/tests/codeception/tests/api/v1/AccountingBestellungCept.php
deleted file mode 100644
index 5d2d27e8e..000000000
--- a/tests/codeception/tests/api/v1/AccountingBestellungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Bestellung/: Bestellung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Bestellung/Bestellung", array("bestellung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingBestellungtagCept.php b/tests/codeception/tests/api/v1/AccountingBestellungtagCept.php
deleted file mode 100644
index 012cc11f1..000000000
--- a/tests/codeception/tests/api/v1/AccountingBestellungtagCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Bestellungtag/: Bestellungtag");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Bestellungtag/Bestellungtag", array("bestellung_id" => "1", "tag" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingBuchungCept.php b/tests/codeception/tests/api/v1/AccountingBuchungCept.php
deleted file mode 100644
index d5d88e407..000000000
--- a/tests/codeception/tests/api/v1/AccountingBuchungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Buchung/: Buchung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Buchung/Buchung", array("buchung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingBuchungstypCept.php b/tests/codeception/tests/api/v1/AccountingBuchungstypCept.php
deleted file mode 100644
index 69e734854..000000000
--- a/tests/codeception/tests/api/v1/AccountingBuchungstypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Buchungstyp/: Buchungstyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Buchungstyp/Buchungstyp", array("buchungstyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingBudgetCept.php b/tests/codeception/tests/api/v1/AccountingBudgetCept.php
deleted file mode 100644
index 3f0203b24..000000000
--- a/tests/codeception/tests/api/v1/AccountingBudgetCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Budget/: Budget");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Budget/Budget", array("kostenstelle_id" => "1", "geschaeftsjahr_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingKontoCept.php b/tests/codeception/tests/api/v1/AccountingKontoCept.php
deleted file mode 100644
index 99bf3ba88..000000000
--- a/tests/codeception/tests/api/v1/AccountingKontoCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Konto/: Konto");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Konto/Konto", array("konto_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingKostenstelleCept.php b/tests/codeception/tests/api/v1/AccountingKostenstelleCept.php
deleted file mode 100644
index 45ea0c016..000000000
--- a/tests/codeception/tests/api/v1/AccountingKostenstelleCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Kostenstelle/: Kostenstelle");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Kostenstelle/Kostenstelle", array("kostenstelle_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingRechnungCept.php b/tests/codeception/tests/api/v1/AccountingRechnungCept.php
deleted file mode 100644
index 4b14c31b6..000000000
--- a/tests/codeception/tests/api/v1/AccountingRechnungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Rechnung/: Rechnung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Rechnung/Rechnung", array("rechnung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingRechnungsbetragCept.php b/tests/codeception/tests/api/v1/AccountingRechnungsbetragCept.php
deleted file mode 100644
index 46c30f8b2..000000000
--- a/tests/codeception/tests/api/v1/AccountingRechnungsbetragCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Rechnungsbetrag/: Rechnungsbetrag");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Rechnungsbetrag/Rechnungsbetrag", array("rechnungsbetrag_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingRechnungstypCept.php b/tests/codeception/tests/api/v1/AccountingRechnungstypCept.php
deleted file mode 100644
index 92ad4c55b..000000000
--- a/tests/codeception/tests/api/v1/AccountingRechnungstypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Rechnungstyp/: Rechnungstyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Rechnungstyp/Rechnungstyp", array("rechnungstyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingVertragCept.php b/tests/codeception/tests/api/v1/AccountingVertragCept.php
deleted file mode 100644
index 6533fba2f..000000000
--- a/tests/codeception/tests/api/v1/AccountingVertragCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Vertrag/: Vertrag");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Vertrag/Vertrag", array("vertrag_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingVertragsstatusCept.php b/tests/codeception/tests/api/v1/AccountingVertragsstatusCept.php
deleted file mode 100644
index 376614e51..000000000
--- a/tests/codeception/tests/api/v1/AccountingVertragsstatusCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Vertragsstatus/: Vertragsstatus");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Vertragsstatus/Vertragsstatus", array("vertragsstatus_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingVertragstypCept.php b/tests/codeception/tests/api/v1/AccountingVertragstypCept.php
deleted file mode 100644
index 945065ac9..000000000
--- a/tests/codeception/tests/api/v1/AccountingVertragstypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Vertragstyp/: Vertragstyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Vertragstyp/Vertragstyp", array("vertragstyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/AccountingZahlungstypCept.php b/tests/codeception/tests/api/v1/AccountingZahlungstypCept.php
deleted file mode 100644
index 0ad9f031d..000000000
--- a/tests/codeception/tests/api/v1/AccountingZahlungstypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/accounting/Zahlungstyp/: Zahlungstyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/accounting/Zahlungstyp/Zahlungstyp", array("zahlungstyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CheckUserAuthCept.php b/tests/codeception/tests/api/v1/CheckUserAuthCept.php
deleted file mode 100644
index 56afcdcce..000000000
--- a/tests/codeception/tests/api/v1/CheckUserAuthCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/CheckUserAuth/: CheckByUsernamePassword");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/CheckUserAuth/CheckByUsernamePassword", array("username" => "1", "password" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexAkadgradCept.php b/tests/codeception/tests/api/v1/CodexAkadgradCept.php
deleted file mode 100644
index 182d6a9a0..000000000
--- a/tests/codeception/tests/api/v1/CodexAkadgradCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Akadgrad/: Akadgrad");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Akadgrad/Akadgrad", array("akadgrad_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexArchivCept.php b/tests/codeception/tests/api/v1/CodexArchivCept.php
deleted file mode 100644
index fc4d9c8e4..000000000
--- a/tests/codeception/tests/api/v1/CodexArchivCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Archiv/: Archiv");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Archiv/Archiv", array("archiv_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexAufmerksamdurchCept.php b/tests/codeception/tests/api/v1/CodexAufmerksamdurchCept.php
deleted file mode 100644
index aa10c8df5..000000000
--- a/tests/codeception/tests/api/v1/CodexAufmerksamdurchCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Aufmerksamdurch/: Aufmerksamdurch");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Aufmerksamdurch/Aufmerksamdurch", array("aufmerksamdurch_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexAusbildungCept.php b/tests/codeception/tests/api/v1/CodexAusbildungCept.php
deleted file mode 100644
index 32b6c6a03..000000000
--- a/tests/codeception/tests/api/v1/CodexAusbildungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Ausbildung/: Ausbildung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Ausbildung/Ausbildung", array("ausbildungcode" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexBerufstaetigkeitCept.php b/tests/codeception/tests/api/v1/CodexBerufstaetigkeitCept.php
deleted file mode 100644
index 397f6f936..000000000
--- a/tests/codeception/tests/api/v1/CodexBerufstaetigkeitCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Berufstaetigkeit/: Berufstaetigkeit");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Berufstaetigkeit/Berufstaetigkeit", array("berufstaetigkeit_code" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexBeschaeftigungsausmassCept.php b/tests/codeception/tests/api/v1/CodexBeschaeftigungsausmassCept.php
deleted file mode 100644
index 804b55690..000000000
--- a/tests/codeception/tests/api/v1/CodexBeschaeftigungsausmassCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Beschaeftigungsausmass/: Beschaeftigungsausmass");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Beschaeftigungsausmass/Beschaeftigungsausmass", array("beschausmasscode" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexBesqualCept.php b/tests/codeception/tests/api/v1/CodexBesqualCept.php
deleted file mode 100644
index fa289f714..000000000
--- a/tests/codeception/tests/api/v1/CodexBesqualCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Besqual/: Besqual");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Besqual/Besqual", array("besqualcode" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexBisfunktionCept.php b/tests/codeception/tests/api/v1/CodexBisfunktionCept.php
deleted file mode 100644
index eca9995fb..000000000
--- a/tests/codeception/tests/api/v1/CodexBisfunktionCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Bisfunktion/: Bisfunktion");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Bisfunktion/Bisfunktion", array("studiengang_kz" => "1", "bisverwendung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexBisioCept.php b/tests/codeception/tests/api/v1/CodexBisioCept.php
deleted file mode 100644
index 81f4dc743..000000000
--- a/tests/codeception/tests/api/v1/CodexBisioCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Bisio/: Bisio");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Bisio/Bisio", array("bisio_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexBisorgformCept.php b/tests/codeception/tests/api/v1/CodexBisorgformCept.php
deleted file mode 100644
index 44b34c0c6..000000000
--- a/tests/codeception/tests/api/v1/CodexBisorgformCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Bisorgform/: Bisorgform");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Bisorgform/Bisorgform", array("bisorgform_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexBisverwendungCept.php b/tests/codeception/tests/api/v1/CodexBisverwendungCept.php
deleted file mode 100644
index 678bb5e0e..000000000
--- a/tests/codeception/tests/api/v1/CodexBisverwendungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Bisverwendung/: Bisverwendung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Bisverwendung/Bisverwendung", array("bisverwendung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexBundeslandCept.php b/tests/codeception/tests/api/v1/CodexBundeslandCept.php
deleted file mode 100644
index 202ce113b..000000000
--- a/tests/codeception/tests/api/v1/CodexBundeslandCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Bundesland/: All");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Bundesland/All", array());
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexEntwicklungsteamCept.php b/tests/codeception/tests/api/v1/CodexEntwicklungsteamCept.php
deleted file mode 100644
index f85cc45ed..000000000
--- a/tests/codeception/tests/api/v1/CodexEntwicklungsteamCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Entwicklungsteam/: Entwicklungsteam");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Entwicklungsteam/Entwicklungsteam", array("studiengang_kz" => "1", "mitarbeiter_uid" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexGemeindeCept.php b/tests/codeception/tests/api/v1/CodexGemeindeCept.php
deleted file mode 100644
index 8226f8530..000000000
--- a/tests/codeception/tests/api/v1/CodexGemeindeCept.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Gemeinde/: Gemeinde GemeindeByPlz");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Gemeinde/Gemeinde", array("gemeinde_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/codex/Gemeinde/GemeindeByPlz", array("plz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexHauptberufCept.php b/tests/codeception/tests/api/v1/CodexHauptberufCept.php
deleted file mode 100644
index b5518173b..000000000
--- a/tests/codeception/tests/api/v1/CodexHauptberufCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Hauptberuf/: Hauptberuf");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Hauptberuf/Hauptberuf", array("hauptberufcode" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexLehrformCept.php b/tests/codeception/tests/api/v1/CodexLehrformCept.php
deleted file mode 100644
index 7f2d9027a..000000000
--- a/tests/codeception/tests/api/v1/CodexLehrformCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Lehrform/: Lehrform");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Lehrform/Lehrform", array("lehrform_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexLgartcodeCept.php b/tests/codeception/tests/api/v1/CodexLgartcodeCept.php
deleted file mode 100644
index 90725028b..000000000
--- a/tests/codeception/tests/api/v1/CodexLgartcodeCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Lgartcode/: Lgartcode");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Lgartcode/Lgartcode", array("lgartcode" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexMobilitaetsprogrammCept.php b/tests/codeception/tests/api/v1/CodexMobilitaetsprogrammCept.php
deleted file mode 100644
index 5a365b3b9..000000000
--- a/tests/codeception/tests/api/v1/CodexMobilitaetsprogrammCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Mobilitaetsprogramm/: Mobilitaetsprogramm");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Mobilitaetsprogramm/Mobilitaetsprogramm", array("mobilitaetsprogramm_code" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexNationCept.php b/tests/codeception/tests/api/v1/CodexNationCept.php
deleted file mode 100644
index 6574293bd..000000000
--- a/tests/codeception/tests/api/v1/CodexNationCept.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Nation/: Nation All");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Nation/Nation", array("nation_code" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/codex/Nation/All", array("orderEnglish" => "1", "ohnesperre" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexNoteCept.php b/tests/codeception/tests/api/v1/CodexNoteCept.php
deleted file mode 100644
index 606305103..000000000
--- a/tests/codeception/tests/api/v1/CodexNoteCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Note/: Note");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Note/Note", array("note" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexOrgformCept.php b/tests/codeception/tests/api/v1/CodexOrgformCept.php
deleted file mode 100644
index 4a54af7e8..000000000
--- a/tests/codeception/tests/api/v1/CodexOrgformCept.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Orgform/: Orgform All OrgformLV");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Orgform/Orgform", array("orgform_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/codex/Orgform/All", array());
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/codex/Orgform/OrgformLV", array());
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexVerwendungCept.php b/tests/codeception/tests/api/v1/CodexVerwendungCept.php
deleted file mode 100644
index 1756483ed..000000000
--- a/tests/codeception/tests/api/v1/CodexVerwendungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Verwendung/: Verwendung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Verwendung/Verwendung", array("verwendung_code" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexZgvCept.php b/tests/codeception/tests/api/v1/CodexZgvCept.php
deleted file mode 100644
index 3778dd699..000000000
--- a/tests/codeception/tests/api/v1/CodexZgvCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Zgv/: Zgv");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Zgv/Zgv", array("zgv_code" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexZgvdoktorCept.php b/tests/codeception/tests/api/v1/CodexZgvdoktorCept.php
deleted file mode 100644
index d469dd289..000000000
--- a/tests/codeception/tests/api/v1/CodexZgvdoktorCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Zgvdoktor/: Zgvdoktor");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Zgvdoktor/Zgvdoktor", array("zgvdoktor_code" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexZgvgruppeCept.php b/tests/codeception/tests/api/v1/CodexZgvgruppeCept.php
deleted file mode 100644
index a4c0be889..000000000
--- a/tests/codeception/tests/api/v1/CodexZgvgruppeCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Zgvgruppe/: Zgvgruppe");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Zgvgruppe/Zgvgruppe", array("gruppe_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexZgvmasterCept.php b/tests/codeception/tests/api/v1/CodexZgvmasterCept.php
deleted file mode 100644
index 960c20f42..000000000
--- a/tests/codeception/tests/api/v1/CodexZgvmasterCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Zgvmaster/: Zgvmaster");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Zgvmaster/Zgvmaster", array("zgvmas_code" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CodexZweckCept.php b/tests/codeception/tests/api/v1/CodexZweckCept.php
deleted file mode 100644
index bb95cd200..000000000
--- a/tests/codeception/tests/api/v1/CodexZweckCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/codex/Zweck/: Zweck");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/codex/Zweck/Zweck", array("zweck_code" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ContentAmpelCept.php b/tests/codeception/tests/api/v1/ContentAmpelCept.php
deleted file mode 100644
index 16497d423..000000000
--- a/tests/codeception/tests/api/v1/ContentAmpelCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/content/Ampel/: Ampel");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/content/Ampel/Ampel", array("ampel_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ContentContentCept.php b/tests/codeception/tests/api/v1/ContentContentCept.php
deleted file mode 100644
index c5a2218a3..000000000
--- a/tests/codeception/tests/api/v1/ContentContentCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/content/Content/: Content");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/content/Content/Content", array("content_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ContentContentchildCept.php b/tests/codeception/tests/api/v1/ContentContentchildCept.php
deleted file mode 100644
index d361f3b6c..000000000
--- a/tests/codeception/tests/api/v1/ContentContentchildCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/content/Contentchild/: Contentchild");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/content/Contentchild/Contentchild", array("contentchild_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ContentContentgruppeCept.php b/tests/codeception/tests/api/v1/ContentContentgruppeCept.php
deleted file mode 100644
index efc49918f..000000000
--- a/tests/codeception/tests/api/v1/ContentContentgruppeCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/content/Contentgruppe/: Contentgruppe");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/content/Contentgruppe/Contentgruppe", array("gruppe_kurzbz" => "1", "content_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ContentContentlogCept.php b/tests/codeception/tests/api/v1/ContentContentlogCept.php
deleted file mode 100644
index 91dbf8303..000000000
--- a/tests/codeception/tests/api/v1/ContentContentlogCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/content/Contentlog/: Contentlog");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/content/Contentlog/Contentlog", array("contentlog_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ContentContentspracheCept.php b/tests/codeception/tests/api/v1/ContentContentspracheCept.php
deleted file mode 100644
index 1f6d44e44..000000000
--- a/tests/codeception/tests/api/v1/ContentContentspracheCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/content/Contentsprache/: Contentsprache");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/content/Contentsprache/Contentsprache", array("contentsprache_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ContentDmsCept.php b/tests/codeception/tests/api/v1/ContentDmsCept.php
deleted file mode 100644
index 4535ef200..000000000
--- a/tests/codeception/tests/api/v1/ContentDmsCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/content/Dms/: Dms");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/content/Dms/Dms", array("dms_id" => "1", "version" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ContentInfoscreenCept.php b/tests/codeception/tests/api/v1/ContentInfoscreenCept.php
deleted file mode 100644
index 95dc9d266..000000000
--- a/tests/codeception/tests/api/v1/ContentInfoscreenCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/content/Infoscreen/: Infoscreen");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/content/Infoscreen/Infoscreen", array("infoscreen_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ContentNewsCept.php b/tests/codeception/tests/api/v1/ContentNewsCept.php
deleted file mode 100644
index 91192caf9..000000000
--- a/tests/codeception/tests/api/v1/ContentNewsCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/content/News/: News");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/content/News/News", array("news_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ContentTemplateCept.php b/tests/codeception/tests/api/v1/ContentTemplateCept.php
deleted file mode 100644
index a49b9ca30..000000000
--- a/tests/codeception/tests/api/v1/ContentTemplateCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/content/Template/: Template");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/content/Template/Template", array("template_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ContentVeranstaltungCept.php b/tests/codeception/tests/api/v1/ContentVeranstaltungCept.php
deleted file mode 100644
index bf30ec638..000000000
--- a/tests/codeception/tests/api/v1/ContentVeranstaltungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/content/Veranstaltung/: Veranstaltung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/content/Veranstaltung/Veranstaltung", array("veranstaltung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ContentVeranstaltungskategorieCept.php b/tests/codeception/tests/api/v1/ContentVeranstaltungskategorieCept.php
deleted file mode 100644
index 9c778281f..000000000
--- a/tests/codeception/tests/api/v1/ContentVeranstaltungskategorieCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/content/Veranstaltungskategorie/: Veranstaltungskategorie");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/content/Veranstaltungskategorie/Veranstaltungskategorie", array("veranstaltungskategorie_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmAkteCept.php b/tests/codeception/tests/api/v1/CrmAkteCept.php
deleted file mode 100644
index 99ef40c00..000000000
--- a/tests/codeception/tests/api/v1/CrmAkteCept.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Akte/: Akte Akten AktenAccepted");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Akte/Akte", array("akte_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/crm/Akte/Akten", array("person_id" => "1", "dokument_kurzbz" => "1", "stg_kz" => "1", "prestudent_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/crm/Akte/AktenAccepted", array("person_id" => "1", "dokument_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmAufnahmeschluesselCept.php b/tests/codeception/tests/api/v1/CrmAufnahmeschluesselCept.php
deleted file mode 100644
index 6d0e8b51e..000000000
--- a/tests/codeception/tests/api/v1/CrmAufnahmeschluesselCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Aufnahmeschluessel/: Aufnahmeschluessel");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Aufnahmeschluessel/Aufnahmeschluessel", array("aufnahmeschluessel" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmAufnahmeterminCept.php b/tests/codeception/tests/api/v1/CrmAufnahmeterminCept.php
deleted file mode 100644
index d3cb8ccc6..000000000
--- a/tests/codeception/tests/api/v1/CrmAufnahmeterminCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Aufnahmetermin/: Aufnahmetermin");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Aufnahmetermin/Aufnahmetermin", array("aufnahmetermin_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmAufnahmetermintypCept.php b/tests/codeception/tests/api/v1/CrmAufnahmetermintypCept.php
deleted file mode 100644
index 9c2b41388..000000000
--- a/tests/codeception/tests/api/v1/CrmAufnahmetermintypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Aufnahmetermintyp/: Aufnahmetermintyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Aufnahmetermintyp/Aufnahmetermintyp", array("aufnahmetermintyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmBewerbungstermineCept.php b/tests/codeception/tests/api/v1/CrmBewerbungstermineCept.php
deleted file mode 100644
index bf035c487..000000000
--- a/tests/codeception/tests/api/v1/CrmBewerbungstermineCept.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Bewerbungstermine/: Bewerbungstermine ByStudiengangStudiensemester ByStudienplan Current");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Bewerbungstermine/Bewerbungstermine", array("bewerbungstermine_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/crm/Bewerbungstermine/ByStudiengangStudiensemester", array("studiengang_kz" => "1", "studiensemester_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/crm/Bewerbungstermine/ByStudienplan", array("studienplan_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/crm/Bewerbungstermine/Current", array());
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmBuchungstypCept.php b/tests/codeception/tests/api/v1/CrmBuchungstypCept.php
deleted file mode 100644
index fb27fe004..000000000
--- a/tests/codeception/tests/api/v1/CrmBuchungstypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Buchungstyp/: Buchungstyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Buchungstyp/Buchungstyp", array("buchungstyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmDokumentCept.php b/tests/codeception/tests/api/v1/CrmDokumentCept.php
deleted file mode 100644
index 63eea778e..000000000
--- a/tests/codeception/tests/api/v1/CrmDokumentCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Dokument/: Dokument");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Dokument/Dokument", array("dokument_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmDokumentprestudentCept.php b/tests/codeception/tests/api/v1/CrmDokumentprestudentCept.php
deleted file mode 100644
index 8c2610852..000000000
--- a/tests/codeception/tests/api/v1/CrmDokumentprestudentCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Dokumentprestudent/: Dokumentprestudent");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Dokumentprestudent/Dokumentprestudent", array("prestudent_id" => "1", "dokument_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmDokumentstudiengangCept.php b/tests/codeception/tests/api/v1/CrmDokumentstudiengangCept.php
deleted file mode 100644
index bd968b7d8..000000000
--- a/tests/codeception/tests/api/v1/CrmDokumentstudiengangCept.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Dokumentstudiengang/: Dokumentstudiengang DokumentstudiengangByStudiengang_kz");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Dokumentstudiengang/Dokumentstudiengang", array("studiengang_kz" => "1", "dokument_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/crm/Dokumentstudiengang/DokumentstudiengangByStudiengang_kz", array("studiengang_kz" => "1", "onlinebewerbung" => "1", "pflicht" => "1", "nachreichbar" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmKontoCept.php b/tests/codeception/tests/api/v1/CrmKontoCept.php
deleted file mode 100644
index 1d683a358..000000000
--- a/tests/codeception/tests/api/v1/CrmKontoCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Konto/: Konto");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Konto/Konto", array("buchungsnr" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmPreincomingCept.php b/tests/codeception/tests/api/v1/CrmPreincomingCept.php
deleted file mode 100644
index b567e66e9..000000000
--- a/tests/codeception/tests/api/v1/CrmPreincomingCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Preincoming/: Preincoming");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Preincoming/Preincoming", array("preincoming_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmPreinteressentCept.php b/tests/codeception/tests/api/v1/CrmPreinteressentCept.php
deleted file mode 100644
index 9c9903345..000000000
--- a/tests/codeception/tests/api/v1/CrmPreinteressentCept.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Preinteressent/: Preinteressent PreinteressentByPersonID");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Preinteressent/Preinteressent", array("preinteressent_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/crm/Preinteressent/PreinteressentByPersonID", array("person_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmPreinteressentstudiengangCept.php b/tests/codeception/tests/api/v1/CrmPreinteressentstudiengangCept.php
deleted file mode 100644
index 5288c69cc..000000000
--- a/tests/codeception/tests/api/v1/CrmPreinteressentstudiengangCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Preinteressentstudiengang/: Preinteressentstudiengang");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Preinteressentstudiengang/Preinteressentstudiengang", array("preinteressent_id" => "1", "studiengang_kz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmPreoutgoingCept.php b/tests/codeception/tests/api/v1/CrmPreoutgoingCept.php
deleted file mode 100644
index 1598f26ea..000000000
--- a/tests/codeception/tests/api/v1/CrmPreoutgoingCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Preoutgoing/: Preoutgoing");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Preoutgoing/Preoutgoing", array("preoutgoing_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmPrestudentCept.php b/tests/codeception/tests/api/v1/CrmPrestudentCept.php
deleted file mode 100644
index 820126e9f..000000000
--- a/tests/codeception/tests/api/v1/CrmPrestudentCept.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Prestudent/: Prestudent PrestudentByPersonID Specialization");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Prestudent/Prestudent", array("prestudent_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/crm/Prestudent/PrestudentByPersonID", array("person_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/crm/Prestudent/Specialization", array("prestudent_id" => "1", "titel" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmPrestudentstatusCept.php b/tests/codeception/tests/api/v1/CrmPrestudentstatusCept.php
deleted file mode 100644
index de348903b..000000000
--- a/tests/codeception/tests/api/v1/CrmPrestudentstatusCept.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Prestudentstatus/: Prestudentstatus LastStatus");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Prestudentstatus/Prestudentstatus", array("ausbildungssemester" => "1", "studiensemester_kurzbz" => "1", "status_kurzbz" => "1", "prestudent_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/crm/Prestudentstatus/LastStatus", array("prestudent_id" => "1", "studiensemester_kurzbz" => "1", "status_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmReihungstestCept.php b/tests/codeception/tests/api/v1/CrmReihungstestCept.php
deleted file mode 100644
index 94cd48628..000000000
--- a/tests/codeception/tests/api/v1/CrmReihungstestCept.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Reihungstest/: Reihungstest ByStudiengangStudiensemester ReihungstestByPersonID");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Reihungstest/Reihungstest", array("reihungstest_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/crm/Reihungstest/ByStudiengangStudiensemester", array("studiengang_kz" => "1", "studiensemester_kurzbz" => "1", "available" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/crm/Reihungstest/ReihungstestByPersonID", array("person_id" => "1", "available" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmRtPersonCept.php b/tests/codeception/tests/api/v1/CrmRtPersonCept.php
deleted file mode 100644
index 70e5f460c..000000000
--- a/tests/codeception/tests/api/v1/CrmRtPersonCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/RtPerson/: RtPerson");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/RtPerson/RtPerson", array("rt_person_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmStatusCept.php b/tests/codeception/tests/api/v1/CrmStatusCept.php
deleted file mode 100644
index 653841f8b..000000000
--- a/tests/codeception/tests/api/v1/CrmStatusCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Status/: Status");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Status/Status", array("status_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmStatusgrundCept.php b/tests/codeception/tests/api/v1/CrmStatusgrundCept.php
deleted file mode 100644
index 250d195ba..000000000
--- a/tests/codeception/tests/api/v1/CrmStatusgrundCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Statusgrund/: Statusgrund");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Statusgrund/Statusgrund", array("statusgrund_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/CrmStudentCept.php b/tests/codeception/tests/api/v1/CrmStudentCept.php
deleted file mode 100644
index 6d926e9dd..000000000
--- a/tests/codeception/tests/api/v1/CrmStudentCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/crm/Student/: Student");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/crm/Student/Student", array("student_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationAbgabeCept.php b/tests/codeception/tests/api/v1/EducationAbgabeCept.php
deleted file mode 100644
index d1db9f7ff..000000000
--- a/tests/codeception/tests/api/v1/EducationAbgabeCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Abgabe/: Abgabe");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Abgabe/Abgabe", array("abgabe_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationAbschlussbeurteilungCept.php b/tests/codeception/tests/api/v1/EducationAbschlussbeurteilungCept.php
deleted file mode 100644
index 53f51ff0e..000000000
--- a/tests/codeception/tests/api/v1/EducationAbschlussbeurteilungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Abschlussbeurteilung/: Abschlussbeurteilung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Abschlussbeurteilung/Abschlussbeurteilung", array("abschlussbeurteilung_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationAbschlusspruefungCept.php b/tests/codeception/tests/api/v1/EducationAbschlusspruefungCept.php
deleted file mode 100644
index e91ca11f7..000000000
--- a/tests/codeception/tests/api/v1/EducationAbschlusspruefungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Abschlusspruefung/: Abschlusspruefung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Abschlusspruefung/Abschlusspruefung", array("abschlusspruefung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationAnrechnungCept.php b/tests/codeception/tests/api/v1/EducationAnrechnungCept.php
deleted file mode 100644
index 3c17a80bb..000000000
--- a/tests/codeception/tests/api/v1/EducationAnrechnungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Anrechnung/: Anrechnung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Anrechnung/Anrechnung", array("anrechnung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationAnwesenheitCept.php b/tests/codeception/tests/api/v1/EducationAnwesenheitCept.php
deleted file mode 100644
index c17db9a94..000000000
--- a/tests/codeception/tests/api/v1/EducationAnwesenheitCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Anwesenheit/: Anwesenheit");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Anwesenheit/Anwesenheit", array("anwesenheit_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationBeispielCept.php b/tests/codeception/tests/api/v1/EducationBeispielCept.php
deleted file mode 100644
index ca81647a8..000000000
--- a/tests/codeception/tests/api/v1/EducationBeispielCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Beispiel/: Beispiel");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Beispiel/Beispiel", array("beispiel_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationBetreuerartCept.php b/tests/codeception/tests/api/v1/EducationBetreuerartCept.php
deleted file mode 100644
index 118e9bb21..000000000
--- a/tests/codeception/tests/api/v1/EducationBetreuerartCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Betreuerart/: Betreuerart");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Betreuerart/Betreuerart", array("betreuerart_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationFeedbackCept.php b/tests/codeception/tests/api/v1/EducationFeedbackCept.php
deleted file mode 100644
index 05cdafaa2..000000000
--- a/tests/codeception/tests/api/v1/EducationFeedbackCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Feedback/: Feedback");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Feedback/Feedback", array("feedback_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLegesamtnoteCept.php b/tests/codeception/tests/api/v1/EducationLegesamtnoteCept.php
deleted file mode 100644
index 365cb7890..000000000
--- a/tests/codeception/tests/api/v1/EducationLegesamtnoteCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Legesamtnote/: Legesamtnote");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Legesamtnote/Legesamtnote", array("lehreinheit_id" => "1", "student_uid" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLehreinheitCept.php b/tests/codeception/tests/api/v1/EducationLehreinheitCept.php
deleted file mode 100644
index 3a151bde6..000000000
--- a/tests/codeception/tests/api/v1/EducationLehreinheitCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lehreinheit/: Lehreinheit");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lehreinheit/Lehreinheit", array("lehreinheit_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLehreinheitgruppeCept.php b/tests/codeception/tests/api/v1/EducationLehreinheitgruppeCept.php
deleted file mode 100644
index ee8f1561a..000000000
--- a/tests/codeception/tests/api/v1/EducationLehreinheitgruppeCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lehreinheitgruppe/: Lehreinheitgruppe");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lehreinheitgruppe/Lehreinheitgruppe", array("lehreinheitgruppe_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLehreinheitmitarbeiterCept.php b/tests/codeception/tests/api/v1/EducationLehreinheitmitarbeiterCept.php
deleted file mode 100644
index a4c4968d6..000000000
--- a/tests/codeception/tests/api/v1/EducationLehreinheitmitarbeiterCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lehreinheitmitarbeiter/: Lehreinheitmitarbeiter");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lehreinheitmitarbeiter/Lehreinheitmitarbeiter", array("mitarbeiter_uid" => "1", "lehreinheit_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLehrfachCept.php b/tests/codeception/tests/api/v1/EducationLehrfachCept.php
deleted file mode 100644
index cca7af642..000000000
--- a/tests/codeception/tests/api/v1/EducationLehrfachCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lehrfach/: Lehrfach");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lehrfach/Lehrfach", array("lehrfach_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLehrfunktionCept.php b/tests/codeception/tests/api/v1/EducationLehrfunktionCept.php
deleted file mode 100644
index 55057c503..000000000
--- a/tests/codeception/tests/api/v1/EducationLehrfunktionCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lehrfunktion/: Lehrfunktion");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lehrfunktion/Lehrfunktion", array("lehrfunktion_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLehrtypCept.php b/tests/codeception/tests/api/v1/EducationLehrtypCept.php
deleted file mode 100644
index 112c2329d..000000000
--- a/tests/codeception/tests/api/v1/EducationLehrtypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lehrtyp/: Lehrtyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lehrtyp/Lehrtyp", array("lehrtyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLehrveranstaltungCept.php b/tests/codeception/tests/api/v1/EducationLehrveranstaltungCept.php
deleted file mode 100644
index 4737d2838..000000000
--- a/tests/codeception/tests/api/v1/EducationLehrveranstaltungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lehrveranstaltung/: Lehrveranstaltung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lehrveranstaltung/Lehrveranstaltung", array("lehrveranstaltung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLenotenschluesselCept.php b/tests/codeception/tests/api/v1/EducationLenotenschluesselCept.php
deleted file mode 100644
index e0d63ba4d..000000000
--- a/tests/codeception/tests/api/v1/EducationLenotenschluesselCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lenotenschluessel/: LeNotenschluessel");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lenotenschluessel/LeNotenschluessel", array("note" => "1", "lehreinheit_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLepruefungCept.php b/tests/codeception/tests/api/v1/EducationLepruefungCept.php
deleted file mode 100644
index c98e883b8..000000000
--- a/tests/codeception/tests/api/v1/EducationLepruefungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lepruefung/: LePruefung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lepruefung/LePruefung", array("lepruefung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLvangebotCept.php b/tests/codeception/tests/api/v1/EducationLvangebotCept.php
deleted file mode 100644
index 25c93a5a4..000000000
--- a/tests/codeception/tests/api/v1/EducationLvangebotCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lvangebot/: Lvangebot");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lvangebot/Lvangebot", array("lvangebot_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLvgesamtnoteCept.php b/tests/codeception/tests/api/v1/EducationLvgesamtnoteCept.php
deleted file mode 100644
index 258d1181a..000000000
--- a/tests/codeception/tests/api/v1/EducationLvgesamtnoteCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lvgesamtnote/: Lvgesamtnote");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lvgesamtnote/Lvgesamtnote", array("student_uid" => "1", "studiensemester_kurzbz" => "1", "lehrveranstaltung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLvinfoCept.php b/tests/codeception/tests/api/v1/EducationLvinfoCept.php
deleted file mode 100644
index e0a24e6ab..000000000
--- a/tests/codeception/tests/api/v1/EducationLvinfoCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lvinfo/: Lvinfo");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lvinfo/Lvinfo", array("sprache" => "1", "lehrveranstaltung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLvregelCept.php b/tests/codeception/tests/api/v1/EducationLvregelCept.php
deleted file mode 100644
index dabc2b233..000000000
--- a/tests/codeception/tests/api/v1/EducationLvregelCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lvregel/: Lvregel");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lvregel/Lvregel", array("lvregel_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationLvregeltypCept.php b/tests/codeception/tests/api/v1/EducationLvregeltypCept.php
deleted file mode 100644
index 2aabbbe7c..000000000
--- a/tests/codeception/tests/api/v1/EducationLvregeltypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Lvregeltyp/: Lvregeltyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Lvregeltyp/Lvregeltyp", array("lvregeltyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationNotenschluesselCept.php b/tests/codeception/tests/api/v1/EducationNotenschluesselCept.php
deleted file mode 100644
index 0e1743016..000000000
--- a/tests/codeception/tests/api/v1/EducationNotenschluesselCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Notenschluessel/: Notenschluessel");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Notenschluessel/Notenschluessel", array("notenschluessel_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationNotenschluesselaufteilungCept.php b/tests/codeception/tests/api/v1/EducationNotenschluesselaufteilungCept.php
deleted file mode 100644
index 258197bc9..000000000
--- a/tests/codeception/tests/api/v1/EducationNotenschluesselaufteilungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Notenschluesselaufteilung/: Notenschluesselaufteilung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Notenschluesselaufteilung/Notenschluesselaufteilung", array("notenschluesselaufteilung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationNotenschluesseluebungCept.php b/tests/codeception/tests/api/v1/EducationNotenschluesseluebungCept.php
deleted file mode 100644
index 66184d90b..000000000
--- a/tests/codeception/tests/api/v1/EducationNotenschluesseluebungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Notenschluesseluebung/: Notenschluesseluebung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Notenschluesseluebung/Notenschluesseluebung", array("note" => "1", "uebung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationNotenschluesselzuordnungCept.php b/tests/codeception/tests/api/v1/EducationNotenschluesselzuordnungCept.php
deleted file mode 100644
index c5c32e385..000000000
--- a/tests/codeception/tests/api/v1/EducationNotenschluesselzuordnungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Notenschluesselzuordnung/: Notenschluesselzuordnung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Notenschluesselzuordnung/Notenschluesselzuordnung", array("notenschluesselzuordnung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationPaabgabeCept.php b/tests/codeception/tests/api/v1/EducationPaabgabeCept.php
deleted file mode 100644
index 7269e75aa..000000000
--- a/tests/codeception/tests/api/v1/EducationPaabgabeCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Paabgabe/: Paabgabe");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Paabgabe/Paabgabe", array("paabgabe_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationPaabgabetypCept.php b/tests/codeception/tests/api/v1/EducationPaabgabetypCept.php
deleted file mode 100644
index b7849c689..000000000
--- a/tests/codeception/tests/api/v1/EducationPaabgabetypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Paabgabetyp/: Paabgabetyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Paabgabetyp/Paabgabetyp", array("paabgabetyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationProjektarbeitCept.php b/tests/codeception/tests/api/v1/EducationProjektarbeitCept.php
deleted file mode 100644
index ce8719307..000000000
--- a/tests/codeception/tests/api/v1/EducationProjektarbeitCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Projektarbeit/: Projektarbeit");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Projektarbeit/Projektarbeit", array("projektarbeit_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationProjektbetreuerCept.php b/tests/codeception/tests/api/v1/EducationProjektbetreuerCept.php
deleted file mode 100644
index 4aaf71701..000000000
--- a/tests/codeception/tests/api/v1/EducationProjektbetreuerCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Projektbetreuer/: Projektbetreuer");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Projektbetreuer/Projektbetreuer", array("betreuerart_kurzbz" => "1", "projektarbeit_id" => "1", "person_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationProjekttypCept.php b/tests/codeception/tests/api/v1/EducationProjekttypCept.php
deleted file mode 100644
index e75fbd83e..000000000
--- a/tests/codeception/tests/api/v1/EducationProjekttypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Projekttyp/: Projekttyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Projekttyp/Projekttyp", array("projekttyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationPruefungCept.php b/tests/codeception/tests/api/v1/EducationPruefungCept.php
deleted file mode 100644
index 5111b2f00..000000000
--- a/tests/codeception/tests/api/v1/EducationPruefungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Pruefung/: Pruefung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Pruefung/Pruefung", array("pruefung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationPruefungsanmeldungCept.php b/tests/codeception/tests/api/v1/EducationPruefungsanmeldungCept.php
deleted file mode 100644
index eb76707c8..000000000
--- a/tests/codeception/tests/api/v1/EducationPruefungsanmeldungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Pruefungsanmeldung/: Pruefungsanmeldung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Pruefungsanmeldung/Pruefungsanmeldung", array("pruefungsanmeldung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationPruefungsfensterCept.php b/tests/codeception/tests/api/v1/EducationPruefungsfensterCept.php
deleted file mode 100644
index ed59f4a2b..000000000
--- a/tests/codeception/tests/api/v1/EducationPruefungsfensterCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Pruefungsfenster/: Pruefungsfenster");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Pruefungsfenster/Pruefungsfenster", array("pruefungsfenster_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationPruefungsstatusCept.php b/tests/codeception/tests/api/v1/EducationPruefungsstatusCept.php
deleted file mode 100644
index 74a9e2491..000000000
--- a/tests/codeception/tests/api/v1/EducationPruefungsstatusCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Pruefungsstatus/: Pruefungsstatus");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Pruefungsstatus/Pruefungsstatus", array("status_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationPruefungsterminCept.php b/tests/codeception/tests/api/v1/EducationPruefungsterminCept.php
deleted file mode 100644
index 96a9f4133..000000000
--- a/tests/codeception/tests/api/v1/EducationPruefungsterminCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Pruefungstermin/: Pruefungstermin");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Pruefungstermin/Pruefungstermin", array("pruefungstermin_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationPruefungstypCept.php b/tests/codeception/tests/api/v1/EducationPruefungstypCept.php
deleted file mode 100644
index 02d185e35..000000000
--- a/tests/codeception/tests/api/v1/EducationPruefungstypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Pruefungstyp/: Pruefungstyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Pruefungstyp/Pruefungstyp", array("pruefungstyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationStudentbeispielCept.php b/tests/codeception/tests/api/v1/EducationStudentbeispielCept.php
deleted file mode 100644
index e409dd561..000000000
--- a/tests/codeception/tests/api/v1/EducationStudentbeispielCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Studentbeispiel/: Studentbeispiel");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Studentbeispiel/Studentbeispiel", array("beispiel_id" => "1", "student_uid" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationStudentlehrverbandCept.php b/tests/codeception/tests/api/v1/EducationStudentlehrverbandCept.php
deleted file mode 100644
index cf6724b29..000000000
--- a/tests/codeception/tests/api/v1/EducationStudentlehrverbandCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Studentlehrverband/: Studentlehrverband");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Studentlehrverband/Studentlehrverband", array("studiensemester_kurzbz" => "1", "student_uid" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationStudentuebungCept.php b/tests/codeception/tests/api/v1/EducationStudentuebungCept.php
deleted file mode 100644
index 5ca032da3..000000000
--- a/tests/codeception/tests/api/v1/EducationStudentuebungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Studentuebung/: Studentuebung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Studentuebung/Studentuebung", array("uebung_id" => "1", "student_uid" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationUebungCept.php b/tests/codeception/tests/api/v1/EducationUebungCept.php
deleted file mode 100644
index 4a538e52e..000000000
--- a/tests/codeception/tests/api/v1/EducationUebungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Uebung/: Uebung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Uebung/Uebung", array("uebung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationZeugnisCept.php b/tests/codeception/tests/api/v1/EducationZeugnisCept.php
deleted file mode 100644
index 821221d4c..000000000
--- a/tests/codeception/tests/api/v1/EducationZeugnisCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Zeugnis/: Zeugnis");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Zeugnis/Zeugnis", array("zeugnis_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/EducationZeugnisnoteCept.php b/tests/codeception/tests/api/v1/EducationZeugnisnoteCept.php
deleted file mode 100644
index 5d203898e..000000000
--- a/tests/codeception/tests/api/v1/EducationZeugnisnoteCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/education/Zeugnisnote/: Zeugnisnote");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/education/Zeugnisnote/Zeugnisnote", array("studiensemester_kurzbz" => "1", "student_uid" => "1", "lehrveranstaltung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationErhalterCept.php b/tests/codeception/tests/api/v1/OrganisationErhalterCept.php
deleted file mode 100644
index 1ad417afb..000000000
--- a/tests/codeception/tests/api/v1/OrganisationErhalterCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Erhalter/: Erhalter");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Erhalter/Erhalter", array("erhalter_kz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationFachbereich2Cept.php b/tests/codeception/tests/api/v1/OrganisationFachbereich2Cept.php
deleted file mode 100644
index 6f3613efb..000000000
--- a/tests/codeception/tests/api/v1/OrganisationFachbereich2Cept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Fachbereich2/: Fachbereich");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Fachbereich2/Fachbereich", array("fachbereich_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationFerienCept.php b/tests/codeception/tests/api/v1/OrganisationFerienCept.php
deleted file mode 100644
index 99db20163..000000000
--- a/tests/codeception/tests/api/v1/OrganisationFerienCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Ferien/: Ferien");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Ferien/Ferien", array("studiengang_kz" => "1", "bezeichnung" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationGeschaeftsjahr2Cept.php b/tests/codeception/tests/api/v1/OrganisationGeschaeftsjahr2Cept.php
deleted file mode 100644
index 546473ec1..000000000
--- a/tests/codeception/tests/api/v1/OrganisationGeschaeftsjahr2Cept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Geschaeftsjahr2/: Geschaeftsjahr");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Geschaeftsjahr2/Geschaeftsjahr", array("geschaeftsjahr_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationGruppeCept.php b/tests/codeception/tests/api/v1/OrganisationGruppeCept.php
deleted file mode 100644
index af5ae0579..000000000
--- a/tests/codeception/tests/api/v1/OrganisationGruppeCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Gruppe/: Gruppe");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Gruppe/Gruppe", array("gruppe_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationLehrverbandCept.php b/tests/codeception/tests/api/v1/OrganisationLehrverbandCept.php
deleted file mode 100644
index ea657b41f..000000000
--- a/tests/codeception/tests/api/v1/OrganisationLehrverbandCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Lehrverband/: Lehrverband");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Lehrverband/Lehrverband", array("gruppe" => "1", "verband" => "1", "semester" => "1", "studiengang_kz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationOrganisationseinheit2Cept.php b/tests/codeception/tests/api/v1/OrganisationOrganisationseinheit2Cept.php
deleted file mode 100644
index b3f479cf8..000000000
--- a/tests/codeception/tests/api/v1/OrganisationOrganisationseinheit2Cept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Organisationseinheit2/: Organisationseinheit");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Organisationseinheit2/Organisationseinheit", array("oe_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationOrganisationseinheittypCept.php b/tests/codeception/tests/api/v1/OrganisationOrganisationseinheittypCept.php
deleted file mode 100644
index b7d1d73c4..000000000
--- a/tests/codeception/tests/api/v1/OrganisationOrganisationseinheittypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Organisationseinheittyp/: Organisationseinheittyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Organisationseinheittyp/Organisationseinheittyp", array("organisationseinheittyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationSemesterwochenCept.php b/tests/codeception/tests/api/v1/OrganisationSemesterwochenCept.php
deleted file mode 100644
index 4a3c4e7b7..000000000
--- a/tests/codeception/tests/api/v1/OrganisationSemesterwochenCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Semesterwochen/: Semesterwochen");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Semesterwochen/Semesterwochen", array("studiengang_kz" => "1", "semester" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationServiceCept.php b/tests/codeception/tests/api/v1/OrganisationServiceCept.php
deleted file mode 100644
index e8101e1e7..000000000
--- a/tests/codeception/tests/api/v1/OrganisationServiceCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Service/: Service");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Service/Service", array("service_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationStandortCept.php b/tests/codeception/tests/api/v1/OrganisationStandortCept.php
deleted file mode 100644
index 705f91c4c..000000000
--- a/tests/codeception/tests/api/v1/OrganisationStandortCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Standort/: Standort");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Standort/Standort", array("standort_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationStatistikCept.php b/tests/codeception/tests/api/v1/OrganisationStatistikCept.php
deleted file mode 100644
index f611f99bc..000000000
--- a/tests/codeception/tests/api/v1/OrganisationStatistikCept.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Statistik/: Statistik All MenueArray");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Statistik/Statistik", array("statistik_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Statistik/All", array("order" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Statistik/MenueArray", array());
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationStudiengang2Cept.php b/tests/codeception/tests/api/v1/OrganisationStudiengang2Cept.php
deleted file mode 100644
index 9724fd902..000000000
--- a/tests/codeception/tests/api/v1/OrganisationStudiengang2Cept.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Studiengang2/: Studiengang AllForBewerbung StudiengangStudienplan StudiengangBewerbung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Studiengang2/Studiengang", array("studiengang_kz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studiengang2/AllForBewerbung", array());
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studiengang2/StudiengangStudienplan", array("studiensemester_kurzbz" => "1", "ausbildungssemester" => "1", "aktiv" => "1", "onlinebewerbung" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studiengang2/StudiengangBewerbung", array());
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationStudiengangstypCept.php b/tests/codeception/tests/api/v1/OrganisationStudiengangstypCept.php
deleted file mode 100644
index 3213db18d..000000000
--- a/tests/codeception/tests/api/v1/OrganisationStudiengangstypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Studiengangstyp/: Studiengangstyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Studiengangstyp/Studiengangstyp", array("typ" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationStudienjahrCept.php b/tests/codeception/tests/api/v1/OrganisationStudienjahrCept.php
deleted file mode 100644
index 485658f93..000000000
--- a/tests/codeception/tests/api/v1/OrganisationStudienjahrCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Studienjahr/: Studienjahr");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Studienjahr/Studienjahr", array("studienjahr_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationStudienordnungCept.php b/tests/codeception/tests/api/v1/OrganisationStudienordnungCept.php
deleted file mode 100644
index bcc292980..000000000
--- a/tests/codeception/tests/api/v1/OrganisationStudienordnungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Studienordnung/: Studienordnung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Studienordnung/Studienordnung", array("studienordnung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationStudienordnungstatusCept.php b/tests/codeception/tests/api/v1/OrganisationStudienordnungstatusCept.php
deleted file mode 100644
index df369c015..000000000
--- a/tests/codeception/tests/api/v1/OrganisationStudienordnungstatusCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Studienordnungstatus/: Studienordnungstatus");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Studienordnungstatus/Studienordnungstatus", array("status_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationStudienplanCept.php b/tests/codeception/tests/api/v1/OrganisationStudienplanCept.php
deleted file mode 100644
index e4307faa2..000000000
--- a/tests/codeception/tests/api/v1/OrganisationStudienplanCept.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Studienplan/: Studienplan Studienplaene StudienplaeneFromSem");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Studienplan/Studienplan", array("studienplan_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studienplan/Studienplaene", array("studiengang_kz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studienplan/StudienplaeneFromSem", array("studiengang_kz" => "1", "studiensemester_kurzbz" => "1", "ausbildungssemester" => "1", "orgform_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationStudienplatzCept.php b/tests/codeception/tests/api/v1/OrganisationStudienplatzCept.php
deleted file mode 100644
index 04208df92..000000000
--- a/tests/codeception/tests/api/v1/OrganisationStudienplatzCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Studienplatz/: Studienplatz");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Studienplatz/Studienplatz", array("studienplatz_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/OrganisationStudiensemesterCept.php b/tests/codeception/tests/api/v1/OrganisationStudiensemesterCept.php
deleted file mode 100644
index 448b872b7..000000000
--- a/tests/codeception/tests/api/v1/OrganisationStudiensemesterCept.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/organisation/Studiensemester/: Studiensemester NextStudiensemester All Akt AktNext LastOrAktSemester NextFrom Previous Nearest Finished Timestamp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/organisation/Studiensemester/Studiensemester", array("studiensemester_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studiensemester/NextStudiensemester", array("art" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studiensemester/All", array("order" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studiensemester/Akt", array());
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studiensemester/AktNext", array("semester" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studiensemester/LastOrAktSemester", array("days" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studiensemester/NextFrom", array("studiensemester_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studiensemester/Previous", array());
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studiensemester/Nearest", array("semester" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studiensemester/Finished", array("limit" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/organisation/Studiensemester/Timestamp", array("studiensemester_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonAdresseCept.php b/tests/codeception/tests/api/v1/PersonAdresseCept.php
deleted file mode 100644
index 717f23621..000000000
--- a/tests/codeception/tests/api/v1/PersonAdresseCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Adresse/: Adresse");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Adresse/Adresse", array("person_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonBankverbindungCept.php b/tests/codeception/tests/api/v1/PersonBankverbindungCept.php
deleted file mode 100644
index 0dc4a26d3..000000000
--- a/tests/codeception/tests/api/v1/PersonBankverbindungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Bankverbindung/: Bankverbindung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Bankverbindung/Bankverbindung", array("bankverbindung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonBenutzerCept.php b/tests/codeception/tests/api/v1/PersonBenutzerCept.php
deleted file mode 100644
index a6284cb6b..000000000
--- a/tests/codeception/tests/api/v1/PersonBenutzerCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Benutzer/: Benutzer");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Benutzer/Benutzer", array("uid" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonBenutzerfunktionCept.php b/tests/codeception/tests/api/v1/PersonBenutzerfunktionCept.php
deleted file mode 100644
index 9465335af..000000000
--- a/tests/codeception/tests/api/v1/PersonBenutzerfunktionCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Benutzerfunktion/: Benutzerfunktion");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Benutzerfunktion/Benutzerfunktion", array("benutzerfunktion_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonBenutzergruppeCept.php b/tests/codeception/tests/api/v1/PersonBenutzergruppeCept.php
deleted file mode 100644
index d38a1559a..000000000
--- a/tests/codeception/tests/api/v1/PersonBenutzergruppeCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Benutzergruppe/: Benutzergruppe");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Benutzergruppe/Benutzergruppe", array("gruppe_kurzbz" => "1", "uid" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonFotostatusCept.php b/tests/codeception/tests/api/v1/PersonFotostatusCept.php
deleted file mode 100644
index 159ef3f5f..000000000
--- a/tests/codeception/tests/api/v1/PersonFotostatusCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Fotostatus/: Fotostatus");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Fotostatus/Fotostatus", array("fotostatus_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonFreebusyCept.php b/tests/codeception/tests/api/v1/PersonFreebusyCept.php
deleted file mode 100644
index 1d91bb89b..000000000
--- a/tests/codeception/tests/api/v1/PersonFreebusyCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Freebusy/: Freebusy");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Freebusy/Freebusy", array("freebusy_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonFreebusytypCept.php b/tests/codeception/tests/api/v1/PersonFreebusytypCept.php
deleted file mode 100644
index 0f61cb9e0..000000000
--- a/tests/codeception/tests/api/v1/PersonFreebusytypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Freebusytyp/: Freebusytyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Freebusytyp/Freebusytyp", array("freebusytyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonKontaktCept.php b/tests/codeception/tests/api/v1/PersonKontaktCept.php
deleted file mode 100644
index 6630d1d1d..000000000
--- a/tests/codeception/tests/api/v1/PersonKontaktCept.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Kontakt/: Kontakt OnlyKontakt KontaktByPersonID OnlyKontaktByPersonID KontaktByPersonIDKontaktTyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Kontakt/Kontakt", array("kontakt_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/person/Kontakt/OnlyKontakt", array("kontakt_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/person/Kontakt/KontaktByPersonID", array("person_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/person/Kontakt/OnlyKontaktByPersonID", array("person_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/person/Kontakt/KontaktByPersonIDKontaktTyp", array("person_id" => "1", "kontakttyp" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonKontaktmediumCept.php b/tests/codeception/tests/api/v1/PersonKontaktmediumCept.php
deleted file mode 100644
index fb94aabfe..000000000
--- a/tests/codeception/tests/api/v1/PersonKontaktmediumCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Kontaktmedium/: Kontaktmedium");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Kontaktmedium/Kontaktmedium", array("kontaktmedium_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonKontakttypCept.php b/tests/codeception/tests/api/v1/PersonKontakttypCept.php
deleted file mode 100644
index e5641a51f..000000000
--- a/tests/codeception/tests/api/v1/PersonKontakttypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Kontakttyp/: Kontakttyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Kontakttyp/Kontakttyp", array("kontakttyp" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonNotizCept.php b/tests/codeception/tests/api/v1/PersonNotizCept.php
deleted file mode 100644
index fa8075664..000000000
--- a/tests/codeception/tests/api/v1/PersonNotizCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Notiz/: Notiz");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Notiz/Notiz", array("notiz_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonNotizzuordnungCept.php b/tests/codeception/tests/api/v1/PersonNotizzuordnungCept.php
deleted file mode 100644
index f42e4716c..000000000
--- a/tests/codeception/tests/api/v1/PersonNotizzuordnungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Notizzuordnung/: Notizzuordnung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Notizzuordnung/Notizzuordnung", array("notizzuordnung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/PersonPersonCept.php b/tests/codeception/tests/api/v1/PersonPersonCept.php
deleted file mode 100644
index 7c51bc914..000000000
--- a/tests/codeception/tests/api/v1/PersonPersonCept.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/person/Person/: Person CheckBewerbung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/person/Person/Person", array("person_id" => "1", "code" => "1", "email" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/person/Person/CheckBewerbung", array("email" => "1", "studiensemester_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ProjectAktivitaetCept.php b/tests/codeception/tests/api/v1/ProjectAktivitaetCept.php
deleted file mode 100644
index 335be190e..000000000
--- a/tests/codeception/tests/api/v1/ProjectAktivitaetCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/project/Aktivitaet/: Aktivitaet");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/project/Aktivitaet/Aktivitaet", array("aktivitaet_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ProjectAufwandstypCept.php b/tests/codeception/tests/api/v1/ProjectAufwandstypCept.php
deleted file mode 100644
index 6110306cf..000000000
--- a/tests/codeception/tests/api/v1/ProjectAufwandstypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/project/Aufwandstyp/: Aufwandstyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/project/Aufwandstyp/Aufwandstyp", array("aufwandstyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ProjectProjektCept.php b/tests/codeception/tests/api/v1/ProjectProjektCept.php
deleted file mode 100644
index 020da46ca..000000000
--- a/tests/codeception/tests/api/v1/ProjectProjektCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/project/Projekt/: Projekt");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/project/Projekt/Projekt", array("projekt_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ProjectProjekt_ressourceCept.php b/tests/codeception/tests/api/v1/ProjectProjekt_ressourceCept.php
deleted file mode 100644
index 2ed76b01b..000000000
--- a/tests/codeception/tests/api/v1/ProjectProjekt_ressourceCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/project/Projekt_ressource/: Projekt_ressource");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/project/Projekt_ressource/Projekt_ressource", array("projekt_ressource_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ProjectProjektphaseCept.php b/tests/codeception/tests/api/v1/ProjectProjektphaseCept.php
deleted file mode 100644
index a1da6196d..000000000
--- a/tests/codeception/tests/api/v1/ProjectProjektphaseCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/project/Projektphase/: Projektphase");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/project/Projektphase/Projektphase", array("projektphase_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ProjectProjekttaskCept.php b/tests/codeception/tests/api/v1/ProjectProjekttaskCept.php
deleted file mode 100644
index 4261367bb..000000000
--- a/tests/codeception/tests/api/v1/ProjectProjekttaskCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/project/Projekttask/: Projekttask");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/project/Projekttask/Projekttask", array("projekttask_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ProjectRessourceCept.php b/tests/codeception/tests/api/v1/ProjectRessourceCept.php
deleted file mode 100644
index a410a4d99..000000000
--- a/tests/codeception/tests/api/v1/ProjectRessourceCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/project/Ressource/: Ressource");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/project/Ressource/Ressource", array("ressource_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/ProjectScrumsprintCept.php b/tests/codeception/tests/api/v1/ProjectScrumsprintCept.php
deleted file mode 100644
index 83d0e5609..000000000
--- a/tests/codeception/tests/api/v1/ProjectScrumsprintCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/project/Scrumsprint/: Scrumsprint");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/project/Scrumsprint/Scrumsprint", array("scrumsprint_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceBetriebsmittelCept.php b/tests/codeception/tests/api/v1/RessourceBetriebsmittelCept.php
deleted file mode 100644
index 3cb893700..000000000
--- a/tests/codeception/tests/api/v1/RessourceBetriebsmittelCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Betriebsmittel/: Betriebsmittel");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Betriebsmittel/Betriebsmittel", array("betriebsmittel_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceBetriebsmittelperson2Cept.php b/tests/codeception/tests/api/v1/RessourceBetriebsmittelperson2Cept.php
deleted file mode 100644
index 45a29937b..000000000
--- a/tests/codeception/tests/api/v1/RessourceBetriebsmittelperson2Cept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Betriebsmittelperson2/: Betriebsmittelperson");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Betriebsmittelperson2/Betriebsmittelperson", array("betriebsmittelperson_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceBetriebsmittelstatusCept.php b/tests/codeception/tests/api/v1/RessourceBetriebsmittelstatusCept.php
deleted file mode 100644
index 1cb34fd1a..000000000
--- a/tests/codeception/tests/api/v1/RessourceBetriebsmittelstatusCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Betriebsmittelstatus/: Betriebsmittelstatus");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Betriebsmittelstatus/Betriebsmittelstatus", array("betriebsmittelstatus_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceBetriebsmitteltypCept.php b/tests/codeception/tests/api/v1/RessourceBetriebsmitteltypCept.php
deleted file mode 100644
index 38defc2ca..000000000
--- a/tests/codeception/tests/api/v1/RessourceBetriebsmitteltypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Betriebsmitteltyp/: Betriebsmitteltyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Betriebsmitteltyp/Betriebsmitteltyp", array("betriebsmitteltyp" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceCoodleCept.php b/tests/codeception/tests/api/v1/RessourceCoodleCept.php
deleted file mode 100644
index 41793132c..000000000
--- a/tests/codeception/tests/api/v1/RessourceCoodleCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Coodle/: Coodle");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Coodle/Coodle", array("coodle_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceErreichbarkeitCept.php b/tests/codeception/tests/api/v1/RessourceErreichbarkeitCept.php
deleted file mode 100644
index da2f61f2f..000000000
--- a/tests/codeception/tests/api/v1/RessourceErreichbarkeitCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Erreichbarkeit/: Erreichbarkeit");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Erreichbarkeit/Erreichbarkeit", array("erreichbarkeit_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceFirmaCept.php b/tests/codeception/tests/api/v1/RessourceFirmaCept.php
deleted file mode 100644
index a6d1009e1..000000000
--- a/tests/codeception/tests/api/v1/RessourceFirmaCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Firma/: Firma");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Firma/Firma", array("firma_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceFirmatagCept.php b/tests/codeception/tests/api/v1/RessourceFirmatagCept.php
deleted file mode 100644
index fe3238056..000000000
--- a/tests/codeception/tests/api/v1/RessourceFirmatagCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Firmatag/: Firmatag");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Firmatag/Firmatag", array("tag" => "1", "firma_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceFirmentypCept.php b/tests/codeception/tests/api/v1/RessourceFirmentypCept.php
deleted file mode 100644
index f4cb90baa..000000000
--- a/tests/codeception/tests/api/v1/RessourceFirmentypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Firmentyp/: Firmentyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Firmentyp/Firmentyp", array("firmentyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceFunktionCept.php b/tests/codeception/tests/api/v1/RessourceFunktionCept.php
deleted file mode 100644
index bb891c1da..000000000
--- a/tests/codeception/tests/api/v1/RessourceFunktionCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Funktion/: Funktion");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Funktion/Funktion", array("funktion_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceLehrmittelCept.php b/tests/codeception/tests/api/v1/RessourceLehrmittelCept.php
deleted file mode 100644
index f25688ad8..000000000
--- a/tests/codeception/tests/api/v1/RessourceLehrmittelCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Lehrmittel/: Lehrmittel");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Lehrmittel/Lehrmittel", array("lehrmittel_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceMitarbeiterCept.php b/tests/codeception/tests/api/v1/RessourceMitarbeiterCept.php
deleted file mode 100644
index 205296ecd..000000000
--- a/tests/codeception/tests/api/v1/RessourceMitarbeiterCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Mitarbeiter/: Mitarbeiter");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Mitarbeiter/Mitarbeiter", array("mitarbeiter_uid" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceOrtCept.php b/tests/codeception/tests/api/v1/RessourceOrtCept.php
deleted file mode 100644
index 5a0486876..000000000
--- a/tests/codeception/tests/api/v1/RessourceOrtCept.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Ort/: Ort All");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Ort/Ort", array("ort_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/ressource/Ort/All", array("raumtyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceOrtraumtypCept.php b/tests/codeception/tests/api/v1/RessourceOrtraumtypCept.php
deleted file mode 100644
index 2749f2fd3..000000000
--- a/tests/codeception/tests/api/v1/RessourceOrtraumtypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Ortraumtyp/: Ortraumtyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Ortraumtyp/Ortraumtyp", array("hierarchie" => "1", "ort_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourcePersonfunktionstandortCept.php b/tests/codeception/tests/api/v1/RessourcePersonfunktionstandortCept.php
deleted file mode 100644
index 768be9039..000000000
--- a/tests/codeception/tests/api/v1/RessourcePersonfunktionstandortCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Personfunktionstandort/: Personfunktionstandort");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Personfunktionstandort/Personfunktionstandort", array("personfunktionstandort_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceRaumtypCept.php b/tests/codeception/tests/api/v1/RessourceRaumtypCept.php
deleted file mode 100644
index 1bb7c2b47..000000000
--- a/tests/codeception/tests/api/v1/RessourceRaumtypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Raumtyp/: Raumtyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Raumtyp/Raumtyp", array("raumtyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceReservierungCept.php b/tests/codeception/tests/api/v1/RessourceReservierungCept.php
deleted file mode 100644
index ff4a3ecb9..000000000
--- a/tests/codeception/tests/api/v1/RessourceReservierungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Reservierung/: Reservierung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Reservierung/Reservierung", array("reservierung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceStundeCept.php b/tests/codeception/tests/api/v1/RessourceStundeCept.php
deleted file mode 100644
index 2c4bf4ba6..000000000
--- a/tests/codeception/tests/api/v1/RessourceStundeCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Stunde/: Stunde");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Stunde/Stunde", array("stunde" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceStundenplanCept.php b/tests/codeception/tests/api/v1/RessourceStundenplanCept.php
deleted file mode 100644
index cc123f70c..000000000
--- a/tests/codeception/tests/api/v1/RessourceStundenplanCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Stundenplan/: Stundenplan");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Stundenplan/Stundenplan", array("stundenplan_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceStundenplandevCept.php b/tests/codeception/tests/api/v1/RessourceStundenplandevCept.php
deleted file mode 100644
index b3b0febbd..000000000
--- a/tests/codeception/tests/api/v1/RessourceStundenplandevCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Stundenplandev/: Stundenplandev");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Stundenplandev/Stundenplandev", array("stundenplandev_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceZeitaufzeichnungCept.php b/tests/codeception/tests/api/v1/RessourceZeitaufzeichnungCept.php
deleted file mode 100644
index 7c3eab914..000000000
--- a/tests/codeception/tests/api/v1/RessourceZeitaufzeichnungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Zeitaufzeichnung/: Zeitaufzeichnung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Zeitaufzeichnung/Zeitaufzeichnung", array("zeitaufzeichnung_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceZeitsperreCept.php b/tests/codeception/tests/api/v1/RessourceZeitsperreCept.php
deleted file mode 100644
index f43f7ea94..000000000
--- a/tests/codeception/tests/api/v1/RessourceZeitsperreCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Zeitsperre/: Zeitsperre");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Zeitsperre/Zeitsperre", array("zeitsperre_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceZeitsperretypCept.php b/tests/codeception/tests/api/v1/RessourceZeitsperretypCept.php
deleted file mode 100644
index 5fca56e2b..000000000
--- a/tests/codeception/tests/api/v1/RessourceZeitsperretypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Zeitsperretyp/: Zeitsperretyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Zeitsperretyp/Zeitsperretyp", array("zeitsperretyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/RessourceZeitwunschCept.php b/tests/codeception/tests/api/v1/RessourceZeitwunschCept.php
deleted file mode 100644
index ce46257f7..000000000
--- a/tests/codeception/tests/api/v1/RessourceZeitwunschCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Zeitwunsch/: Zeitwunsch");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Zeitwunsch/Zeitwunsch", array("tag" => "1", "mitarbeiter_uid" => "1", "stunde" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemAppdatenCept.php b/tests/codeception/tests/api/v1/SystemAppdatenCept.php
deleted file mode 100644
index c8a6b5302..000000000
--- a/tests/codeception/tests/api/v1/SystemAppdatenCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Appdaten/: Appdaten");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Appdaten/Appdaten", array("appdaten_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemBenutzerrolleCept.php b/tests/codeception/tests/api/v1/SystemBenutzerrolleCept.php
deleted file mode 100644
index 1cbdc5208..000000000
--- a/tests/codeception/tests/api/v1/SystemBenutzerrolleCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Benutzerrolle/: Benutzerrolle");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Benutzerrolle/Benutzerrolle", array("benutzerrolle_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemBerechtigungCept.php b/tests/codeception/tests/api/v1/SystemBerechtigungCept.php
deleted file mode 100644
index 31a63aea8..000000000
--- a/tests/codeception/tests/api/v1/SystemBerechtigungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Berechtigung/: Berechtigung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Berechtigung/Berechtigung", array("berechtigung_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemCallerLibraryCept.php b/tests/codeception/tests/api/v1/SystemCallerLibraryCept.php
deleted file mode 100644
index c5b302f21..000000000
--- a/tests/codeception/tests/api/v1/SystemCallerLibraryCept.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/CallerLibrary/Call");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-
-$I->sendGET(
-	"v1/system/CallerLibrary/Call",
-	array(
-		"resource" => "PhrasesLib",
-		"function" => "getPhrase",
-		"phrase_id" => 1
-	)
-);
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
\ No newline at end of file
diff --git a/tests/codeception/tests/api/v1/SystemCallerModelCept.php b/tests/codeception/tests/api/v1/SystemCallerModelCept.php
deleted file mode 100644
index b5edabe04..000000000
--- a/tests/codeception/tests/api/v1/SystemCallerModelCept.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/CallerModel/Call");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-
-$I->sendGET(
-	"v1/system/CallerModel/Call",
-	array(
-		"resource" => "codex/Bundesland_model",
-		"function" => "load",
-		"bundesland_code" => "1"
-	)
-);
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
\ No newline at end of file
diff --git a/tests/codeception/tests/api/v1/SystemCronjobCept.php b/tests/codeception/tests/api/v1/SystemCronjobCept.php
deleted file mode 100644
index f9a98d115..000000000
--- a/tests/codeception/tests/api/v1/SystemCronjobCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Cronjob/: Cronjob");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Cronjob/Cronjob", array("cronjob_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemFilterCept.php b/tests/codeception/tests/api/v1/SystemFilterCept.php
deleted file mode 100644
index aec516b89..000000000
--- a/tests/codeception/tests/api/v1/SystemFilterCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Filter/: Filter");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Filter/Filter", array("filter_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemLogCept.php b/tests/codeception/tests/api/v1/SystemLogCept.php
deleted file mode 100644
index d00f75acd..000000000
--- a/tests/codeception/tests/api/v1/SystemLogCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Log/: Log");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Log/Log", array("log_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemMessageCept.php b/tests/codeception/tests/api/v1/SystemMessageCept.php
deleted file mode 100644
index 8c802b563..000000000
--- a/tests/codeception/tests/api/v1/SystemMessageCept.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Message/: MessagesByPersonID MessagesByUID MessagesByToken SentMessagesByPerson");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Message/MessagesByPersonID", array("person_id" => "1", "all" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/system/Message/MessagesByUID", array("uid" => "1", "all" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/system/Message/MessagesByToken", array("token" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/system/Message/SentMessagesByPerson", array("person_id" => "1", "all" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemPhraseCept.php b/tests/codeception/tests/api/v1/SystemPhraseCept.php
deleted file mode 100644
index 7564f73e3..000000000
--- a/tests/codeception/tests/api/v1/SystemPhraseCept.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Phrase/: Phrase Phrases");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Phrase/Phrase", array("phrase_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
-$I->sendGET("v1/system/Phrase/Phrases", array("app" => "1", "sprache" => "1", "phrase" => "1", "orgeinheit_kurzbz" => "1", "orgform_kurzbz" => "1", "blockTags" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemRolleCept.php b/tests/codeception/tests/api/v1/SystemRolleCept.php
deleted file mode 100644
index 0c0ba57a5..000000000
--- a/tests/codeception/tests/api/v1/SystemRolleCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Rolle/: Rolle");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Rolle/Rolle", array("rolle_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemRolleberechtigungCept.php b/tests/codeception/tests/api/v1/SystemRolleberechtigungCept.php
deleted file mode 100644
index 8b85c7020..000000000
--- a/tests/codeception/tests/api/v1/SystemRolleberechtigungCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Rolleberechtigung/: Rolleberechtigung");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Rolleberechtigung/Rolleberechtigung", array("rolle_kurzbz" => "1", "berechtigung_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemServerCept.php b/tests/codeception/tests/api/v1/SystemServerCept.php
deleted file mode 100644
index 38a68ad74..000000000
--- a/tests/codeception/tests/api/v1/SystemServerCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Server/: Server");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Server/Server", array("server_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemSprache2Cept.php b/tests/codeception/tests/api/v1/SystemSprache2Cept.php
deleted file mode 100644
index b3e2b9c68..000000000
--- a/tests/codeception/tests/api/v1/SystemSprache2Cept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Sprache2/: Sprache");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Sprache2/Sprache", array("sprache" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemTagCept.php b/tests/codeception/tests/api/v1/SystemTagCept.php
deleted file mode 100644
index e26e43795..000000000
--- a/tests/codeception/tests/api/v1/SystemTagCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Tag/: Tag");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Tag/Tag", array("tag" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemVariableCept.php b/tests/codeception/tests/api/v1/SystemVariableCept.php
deleted file mode 100644
index f92a5a3d3..000000000
--- a/tests/codeception/tests/api/v1/SystemVariableCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Variable/: Variable");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Variable/Variable", array("uid" => "1", "name" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemVorlageCept.php b/tests/codeception/tests/api/v1/SystemVorlageCept.php
deleted file mode 100644
index 02ef6505f..000000000
--- a/tests/codeception/tests/api/v1/SystemVorlageCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Vorlage/: Vorlage");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Vorlage/Vorlage", array("vorlage_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemVorlagestudiengangCept.php b/tests/codeception/tests/api/v1/SystemVorlagestudiengangCept.php
deleted file mode 100644
index 29f4e7f9a..000000000
--- a/tests/codeception/tests/api/v1/SystemVorlagestudiengangCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Vorlagestudiengang/: Vorlagestudiengang");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Vorlagestudiengang/Vorlagestudiengang", array("vorlagestudiengang_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemWebservicelogCept.php b/tests/codeception/tests/api/v1/SystemWebservicelogCept.php
deleted file mode 100644
index 9d50762d1..000000000
--- a/tests/codeception/tests/api/v1/SystemWebservicelogCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Webservicelog/: Webservicelog");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Webservicelog/Webservicelog", array("webservicelog_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemWebservicerechtCept.php b/tests/codeception/tests/api/v1/SystemWebservicerechtCept.php
deleted file mode 100644
index c4e8894b9..000000000
--- a/tests/codeception/tests/api/v1/SystemWebservicerechtCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Webservicerecht/: Webservicerecht");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Webservicerecht/Webservicerecht", array("webservicerecht_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/SystemWebservicetypCept.php b/tests/codeception/tests/api/v1/SystemWebservicetypCept.php
deleted file mode 100644
index 0cb25c155..000000000
--- a/tests/codeception/tests/api/v1/SystemWebservicetypCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/system/Webservicetyp/: Webservicetyp");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/system/Webservicetyp/Webservicetyp", array("webservicetyp_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/TestCept.php b/tests/codeception/tests/api/v1/TestCept.php
deleted file mode 100644
index 688868cc8..000000000
--- a/tests/codeception/tests/api/v1/TestCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/Test/: Test");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/Test/Test", array());
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/TesttoolAblaufCept.php b/tests/codeception/tests/api/v1/TesttoolAblaufCept.php
deleted file mode 100644
index eaaf62dbb..000000000
--- a/tests/codeception/tests/api/v1/TesttoolAblaufCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/testtool/Ablauf/: Ablauf");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/testtool/Ablauf/Ablauf", array("ablauf_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/TesttoolAntwortCept.php b/tests/codeception/tests/api/v1/TesttoolAntwortCept.php
deleted file mode 100644
index a959203c6..000000000
--- a/tests/codeception/tests/api/v1/TesttoolAntwortCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/testtool/Antwort/: Antwort");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/testtool/Antwort/Antwort", array("antwort_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/TesttoolFrageCept.php b/tests/codeception/tests/api/v1/TesttoolFrageCept.php
deleted file mode 100644
index 482f3a869..000000000
--- a/tests/codeception/tests/api/v1/TesttoolFrageCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/testtool/Frage/: Frage");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/testtool/Frage/Frage", array("frage_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/TesttoolGebietCept.php b/tests/codeception/tests/api/v1/TesttoolGebietCept.php
deleted file mode 100644
index a61f71f16..000000000
--- a/tests/codeception/tests/api/v1/TesttoolGebietCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/testtool/Gebiet/: Gebiet");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/testtool/Gebiet/Gebiet", array("gebiet_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/TesttoolKategorieCept.php b/tests/codeception/tests/api/v1/TesttoolKategorieCept.php
deleted file mode 100644
index 7913e6612..000000000
--- a/tests/codeception/tests/api/v1/TesttoolKategorieCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/testtool/Kategorie/: Kategorie");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/testtool/Kategorie/Kategorie", array("kategorie_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/TesttoolKriterienCept.php b/tests/codeception/tests/api/v1/TesttoolKriterienCept.php
deleted file mode 100644
index f67377dbe..000000000
--- a/tests/codeception/tests/api/v1/TesttoolKriterienCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/testtool/Kriterien/: Kriterien");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/testtool/Kriterien/Kriterien", array("kriterien_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/TesttoolPrueflingCept.php b/tests/codeception/tests/api/v1/TesttoolPrueflingCept.php
deleted file mode 100644
index 3d74cecce..000000000
--- a/tests/codeception/tests/api/v1/TesttoolPrueflingCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/testtool/Pruefling/: Pruefling");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/testtool/Pruefling/Pruefling", array("pruefling_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/api/v1/TesttoolVorschlagCept.php b/tests/codeception/tests/api/v1/TesttoolVorschlagCept.php
deleted file mode 100644
index 6a06b3915..000000000
--- a/tests/codeception/tests/api/v1/TesttoolVorschlagCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/testtool/Vorschlag/: Vorschlag");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/testtool/Vorschlag/Vorschlag", array("vorschlag_id" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();
diff --git a/tests/codeception/tests/functional.suite.yml.dist b/tests/codeception/tests/functional.suite.yml.dist
deleted file mode 100644
index 1f7d83be2..000000000
--- a/tests/codeception/tests/functional.suite.yml.dist
+++ /dev/null
@@ -1,10 +0,0 @@
-# Codeception Test Suite Configuration
-
-# suite for functional (integration) tests.
-# emulate web requests and make application process them.
-# Include one of framework modules (Symfony2, Yii2, Laravel4) to use it.
-
-class_name: FunctionalTester
-modules:
-    enabled:
-        - Filesystem
\ No newline at end of file
diff --git a/tests/codeception/tests/functional/FunctionalTester.php b/tests/codeception/tests/functional/FunctionalTester.php
deleted file mode 100644
index 76a14cf79..000000000
--- a/tests/codeception/tests/functional/FunctionalTester.php
+++ /dev/null
@@ -1,360 +0,0 @@
-<?php //[STAMP] 40f12b65758ce0396ebc7f7f0af11f8c
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-
-use Codeception\Module\Filesystem;
-use Codeception\Module\FunctionalHelper;
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method void haveFriend($name, $actorClass = null)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class FunctionalTester extends \Codeception\Actor
-{
-   
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Enters a directory In local filesystem.
-     * Project root directory is used by default
-     *
-     * @param $path
-     * @see \Codeception\Module\Filesystem::amInPath()
-     */
-    public function amInPath($path) {
-        return $this->scenario->runStep(new \Codeception\Step\Condition('amInPath', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Opens a file and stores it's content.
-     *
-     * Usage:
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('composer.json');
-     * $I->seeInThisFile('codeception/codeception');
-     * ?>
-     * ```
-     *
-     * @param $filename
-     * @see \Codeception\Module\Filesystem::openFile()
-     */
-    public function openFile($filename) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('openFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Deletes a file
-     *
-     * ``` php
-     * <?php
-     * $I->deleteFile('composer.lock');
-     * ?>
-     * ```
-     *
-     * @param $filename
-     * @see \Codeception\Module\Filesystem::deleteFile()
-     */
-    public function deleteFile($filename) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('deleteFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Deletes directory with all subdirectories
-     *
-     * ``` php
-     * <?php
-     * $I->deleteDir('vendor');
-     * ?>
-     * ```
-     *
-     * @param $dirname
-     * @see \Codeception\Module\Filesystem::deleteDir()
-     */
-    public function deleteDir($dirname) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('deleteDir', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Copies directory with all contents
-     *
-     * ``` php
-     * <?php
-     * $I->copyDir('vendor','old_vendor');
-     * ?>
-     * ```
-     *
-     * @param $src
-     * @param $dst
-     * @see \Codeception\Module\Filesystem::copyDir()
-     */
-    public function copyDir($src, $dst) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('copyDir', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks If opened file has `text` in it.
-     *
-     * Usage:
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('composer.json');
-     * $I->seeInThisFile('codeception/codeception');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Filesystem::seeInThisFile()
-     */
-    public function canSeeInThisFile($text) {
-        return $this->scenario->runStep(new \Codeception\Step\ConditionalAssertion('seeInThisFile', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks If opened file has `text` in it.
-     *
-     * Usage:
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('composer.json');
-     * $I->seeInThisFile('codeception/codeception');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @see \Codeception\Module\Filesystem::seeInThisFile()
-     */
-    public function seeInThisFile($text) {
-        return $this->scenario->runStep(new \Codeception\Step\Assertion('seeInThisFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks the strict matching of file contents.
-     * Unlike `seeInThisFile` will fail if file has something more than expected lines.
-     * Better to use with HEREDOC strings.
-     * Matching is done after removing "\r" chars from file content.
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('process.pid');
-     * $I->seeFileContentsEqual('3192');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Filesystem::seeFileContentsEqual()
-     */
-    public function canSeeFileContentsEqual($text) {
-        return $this->scenario->runStep(new \Codeception\Step\ConditionalAssertion('seeFileContentsEqual', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks the strict matching of file contents.
-     * Unlike `seeInThisFile` will fail if file has something more than expected lines.
-     * Better to use with HEREDOC strings.
-     * Matching is done after removing "\r" chars from file content.
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('process.pid');
-     * $I->seeFileContentsEqual('3192');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @see \Codeception\Module\Filesystem::seeFileContentsEqual()
-     */
-    public function seeFileContentsEqual($text) {
-        return $this->scenario->runStep(new \Codeception\Step\Assertion('seeFileContentsEqual', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks If opened file doesn't contain `text` in it
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('composer.json');
-     * $I->dontSeeInThisFile('codeception/codeception');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Filesystem::dontSeeInThisFile()
-     */
-    public function cantSeeInThisFile($text) {
-        return $this->scenario->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInThisFile', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks If opened file doesn't contain `text` in it
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('composer.json');
-     * $I->dontSeeInThisFile('codeception/codeception');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @see \Codeception\Module\Filesystem::dontSeeInThisFile()
-     */
-    public function dontSeeInThisFile($text) {
-        return $this->scenario->runStep(new \Codeception\Step\Assertion('dontSeeInThisFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Deletes a file
-     * @see \Codeception\Module\Filesystem::deleteThisFile()
-     */
-    public function deleteThisFile() {
-        return $this->scenario->runStep(new \Codeception\Step\Action('deleteThisFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file exists in path.
-     * Opens a file when it's exists
-     *
-     * ``` php
-     * <?php
-     * $I->seeFileFound('UserModel.php','app/models');
-     * ?>
-     * ```
-     *
-     * @param $filename
-     * @param string $path
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Filesystem::seeFileFound()
-     */
-    public function canSeeFileFound($filename, $path = null) {
-        return $this->scenario->runStep(new \Codeception\Step\ConditionalAssertion('seeFileFound', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file exists in path.
-     * Opens a file when it's exists
-     *
-     * ``` php
-     * <?php
-     * $I->seeFileFound('UserModel.php','app/models');
-     * ?>
-     * ```
-     *
-     * @param $filename
-     * @param string $path
-     * @see \Codeception\Module\Filesystem::seeFileFound()
-     */
-    public function seeFileFound($filename, $path = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Assertion('seeFileFound', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file does not exists in path
-     *
-     * @param $filename
-     * @param string $path
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Filesystem::dontSeeFileFound()
-     */
-    public function cantSeeFileFound($filename, $path = null) {
-        return $this->scenario->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeFileFound', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file does not exists in path
-     *
-     * @param $filename
-     * @param string $path
-     * @see \Codeception\Module\Filesystem::dontSeeFileFound()
-     */
-    public function dontSeeFileFound($filename, $path = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Assertion('dontSeeFileFound', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Erases directory contents
-     *
-     * ``` php
-     * <?php
-     * $I->cleanDir('logs');
-     * ?>
-     * ```
-     *
-     * @param $dirname
-     * @see \Codeception\Module\Filesystem::cleanDir()
-     */
-    public function cleanDir($dirname) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('cleanDir', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Saves contents to file
-     *
-     * @param $filename
-     * @param $contents
-     * @see \Codeception\Module\Filesystem::writeToFile()
-     */
-    public function writeToFile($filename, $contents) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('writeToFile', func_get_args()));
-    }
-}
diff --git a/tests/codeception/tests/functional/_bootstrap.php b/tests/codeception/tests/functional/_bootstrap.php
deleted file mode 100644
index 8a8855580..000000000
--- a/tests/codeception/tests/functional/_bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// Here you can initialize variables that will be available to your tests
diff --git a/tests/codeception/tests/unit.suite.yml.dist b/tests/codeception/tests/unit.suite.yml.dist
deleted file mode 100644
index 9a79a8331..000000000
--- a/tests/codeception/tests/unit.suite.yml.dist
+++ /dev/null
@@ -1,7 +0,0 @@
-# Codeception Test Suite Configuration
-
-# suite for unit (internal) tests.
-class_name: UnitTester
-modules:
-    enabled:
-        - Asserts
\ No newline at end of file
diff --git a/tests/codeception/tests/unit/UnitTester.php b/tests/codeception/tests/unit/UnitTester.php
deleted file mode 100644
index 1b95ec3d2..000000000
--- a/tests/codeception/tests/unit/UnitTester.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php //[STAMP] ee2ab7cabfab0d617b65bfcb0547943f
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-
-use Codeception\Module\Asserts;
-use Codeception\Module\UnitHelper;
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method void haveFriend($name, $actorClass = null)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class UnitTester extends \Codeception\Actor
-{
-   
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are equal.
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     *
-     * @return mixed
-     * @see \Codeception\Module\Asserts::assertEquals()
-     */
-    public function assertEquals($expected, $actual, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are not equal
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotEquals()
-     */
-    public function assertNotEquals($expected, $actual, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertNotEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that expected is greater than actual
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertGreaterThan()
-     */
-    public function assertGreaterThan($expected, $actual, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertGreaterThan', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @deprecated
-     * @see \Codeception\Module\Asserts::assertGreaterThen()
-     */
-    public function assertGreaterThen($expected, $actual, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertGreaterThen', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that expected is greater or equal than actual
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertGreaterThanOrEqual()
-     */
-    public function assertGreaterThanOrEqual($expected, $actual, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertGreaterThanOrEqual', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @deprecated
-     * @see \Codeception\Module\Asserts::assertGreaterThenOrEqual()
-     */
-    public function assertGreaterThenOrEqual($expected, $actual, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertGreaterThenOrEqual', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that expected is less than actual
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertLessThan()
-     */
-    public function assertLessThan($expected, $actual, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertLessThan', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that expected is less or equal than actual
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertLessThanOrEqual()
-     */
-    public function assertLessThanOrEqual($expected, $actual, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertLessThanOrEqual', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that haystack contains needle
-     *
-     * @param        $needle
-     * @param        $haystack
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertContains()
-     */
-    public function assertContains($needle, $haystack, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertContains', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that haystack doesn't contain needle.
-     *
-     * @param        $needle
-     * @param        $haystack
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotContains()
-     */
-    public function assertNotContains($needle, $haystack, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertNotContains', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is empty.
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertEmpty()
-     */
-    public function assertEmpty($actual, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertEmpty', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is not empty.
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotEmpty()
-     */
-    public function assertNotEmpty($actual, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertNotEmpty', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is NULL
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNull()
-     */
-    public function assertNull($actual, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertNull', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is not NULL
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotNull()
-     */
-    public function assertNotNull($actual, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertNotNull', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that condition is positive.
-     *
-     * @param        $condition
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertTrue()
-     */
-    public function assertTrue($condition, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertTrue', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that condition is negative.
-     *
-     * @param        $condition
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertFalse()
-     */
-    public function assertFalse($condition, $message = null) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('assertFalse', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Fails the test with message.
-     *
-     * @param $message
-     * @see \Codeception\Module\Asserts::fail()
-     */
-    public function fail($message) {
-        return $this->scenario->runStep(new \Codeception\Step\Action('fail', func_get_args()));
-    }
-}
diff --git a/tests/codeception/tests/unit/_bootstrap.php b/tests/codeception/tests/unit/_bootstrap.php
deleted file mode 100644
index 8a8855580..000000000
--- a/tests/codeception/tests/unit/_bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// Here you can initialize variables that will be available to your tests
diff --git a/tests/codesniffer/FHComplete/Sniffs/Classes/FHCPropertyDeclarationSniff.php b/tests/codesniffer/FHComplete/Sniffs/Classes/FHCPropertyDeclarationSniff.php
new file mode 100644
index 000000000..c5ecd1232
--- /dev/null
+++ b/tests/codesniffer/FHComplete/Sniffs/Classes/FHCPropertyDeclarationSniff.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Verifies that properties are declared correctly.
+ *
+ * NOTE: It simply overrides the method processMemberVar of the Standards\PSR2\Sniffs\Classes\PropertyDeclarationSniff class
+ *
+ */
+
+namespace PHP_CodeSniffer\Standards\FHComplete\Sniffs\Classes;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\AbstractVariableSniff;
+use PHP_CodeSniffer\Util\Tokens;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\Classes\PropertyDeclarationSniff;
+
+class FHCPropertyDeclarationSniff extends PropertyDeclarationSniff
+{
+    /**
+     * Processes the function tokens within the class.
+     *
+     * NOTE: it does not check if the property name starts with an underscore "_"
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+     * @param int                         $stackPtr  The position where the token was found.
+     *
+     * @return void
+     */
+    protected function processMemberVar(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        // Detect multiple properties defined at the same time. Throw an error
+        // for this, but also only process the first property in the list so we don't
+        // repeat errors.
+        $find   = Tokens::$scopeModifiers;
+        $find[] = T_VARIABLE;
+        $find[] = T_VAR;
+        $find[] = T_SEMICOLON;
+        $find[] = T_OPEN_CURLY_BRACKET;
+
+        $prev = $phpcsFile->findPrevious($find, ($stackPtr - 1));
+        if ($tokens[$prev]['code'] === T_VARIABLE) {
+            return;
+        }
+
+        if ($tokens[$prev]['code'] === T_VAR) {
+            $error = 'The var keyword must not be used to declare a property';
+            $phpcsFile->addError($error, $stackPtr, 'VarUsed');
+        }
+
+        $next = $phpcsFile->findNext([T_VARIABLE, T_SEMICOLON], ($stackPtr + 1));
+        if ($next !== false && $tokens[$next]['code'] === T_VARIABLE) {
+            $error = 'There must not be more than one property declared per statement';
+            $phpcsFile->addError($error, $stackPtr, 'Multiple');
+        }
+
+        try {
+            $propertyInfo = $phpcsFile->getMemberProperties($stackPtr);
+            if (empty($propertyInfo) === true) {
+                return;
+            }
+        } catch (\Exception $e) {
+            // Turns out not to be a property after all.
+            return;
+        }
+
+        if ($propertyInfo['type'] !== '') {
+            $typeToken = $propertyInfo['type_end_token'];
+            $error     = 'There must be 1 space after the property type declaration; %s found';
+            if ($tokens[($typeToken + 1)]['code'] !== T_WHITESPACE) {
+                $data = ['0'];
+                $fix  = $phpcsFile->addFixableError($error, $typeToken, 'SpacingAfterType', $data);
+                if ($fix === true) {
+                    $phpcsFile->fixer->addContent($typeToken, ' ');
+                }
+            } else if ($tokens[($typeToken + 1)]['content'] !== ' ') {
+                $next = $phpcsFile->findNext(T_WHITESPACE, ($typeToken + 1), null, true);
+                if ($tokens[$next]['line'] !== $tokens[$typeToken]['line']) {
+                    $found = 'newline';
+                } else {
+                    $found = $tokens[($typeToken + 1)]['length'];
+                }
+
+                $data = [$found];
+
+                $nextNonWs = $phpcsFile->findNext(Tokens::$emptyTokens, ($typeToken + 1), null, true);
+                if ($nextNonWs !== $next) {
+                    $phpcsFile->addError($error, $typeToken, 'SpacingAfterType', $data);
+                } else {
+                    $fix = $phpcsFile->addFixableError($error, $typeToken, 'SpacingAfterType', $data);
+                    if ($fix === true) {
+                        if ($found === 'newline') {
+                            $phpcsFile->fixer->beginChangeset();
+                            for ($x = ($typeToken + 1); $x < $next; $x++) {
+                                $phpcsFile->fixer->replaceToken($x, '');
+                            }
+
+                            $phpcsFile->fixer->addContent($typeToken, ' ');
+                            $phpcsFile->fixer->endChangeset();
+                        } else {
+                            $phpcsFile->fixer->replaceToken(($typeToken + 1), ' ');
+                        }
+                    }
+                }
+            }//end if
+        }//end if
+
+        if ($propertyInfo['scope_specified'] === false) {
+            $error = 'Visibility must be declared on property "%s"';
+            $data  = [$tokens[$stackPtr]['content']];
+            $phpcsFile->addError($error, $stackPtr, 'ScopeMissing', $data);
+        }
+
+        if ($propertyInfo['scope_specified'] === true && $propertyInfo['is_static'] === true) {
+            $scopePtr  = $phpcsFile->findPrevious(Tokens::$scopeModifiers, ($stackPtr - 1));
+            $staticPtr = $phpcsFile->findPrevious(T_STATIC, ($stackPtr - 1));
+            if ($scopePtr < $staticPtr) {
+                return;
+            }
+
+            $error = 'The static declaration must come after the visibility declaration';
+            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'StaticBeforeVisibility');
+            if ($fix === true) {
+                $phpcsFile->fixer->beginChangeset();
+
+                for ($i = ($scopePtr + 1); $scopePtr < $stackPtr; $i++) {
+                    if ($tokens[$i]['code'] !== T_WHITESPACE) {
+                        break;
+                    }
+
+                    $phpcsFile->fixer->replaceToken($i, '');
+                }
+
+                $phpcsFile->fixer->replaceToken($scopePtr, '');
+                $phpcsFile->fixer->addContentBefore($staticPtr, $propertyInfo['scope'].' ');
+
+                $phpcsFile->fixer->endChangeset();
+            }
+        }//end if
+
+    }//end processMemberVar()
+}//end class
+
diff --git a/tests/codesniffer/FHComplete/Sniffs/Classes/FHCValidClassNameSniff.php b/tests/codesniffer/FHComplete/Sniffs/Classes/FHCValidClassNameSniff.php
new file mode 100644
index 000000000..7aaf03816
--- /dev/null
+++ b/tests/codesniffer/FHComplete/Sniffs/Classes/FHCValidClassNameSniff.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Ensures classes are in camel caps, and the first letter is capitalised.
+ *
+ * NOTE:
+ * - it simply overrides the method process of the Standards\Squiz\Sniffs\Classes\ValidClassNameSniff class
+ * - it contains a new implementation of PHP_CodeSniffer\Util\Common::isCamelCaps
+ *
+ */
+
+namespace PHP_CodeSniffer\Standards\FHComplete\Sniffs\Classes;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Common;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\Classes\ValidClassNameSniff;
+
+class FHCValidClassNameSniff extends ValidClassNameSniff
+{
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * NOTE: it does not check if the class name contains an underscore "_"
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The current file being processed.
+     * @param int                         $stackPtr  The position of the current token in the
+     *                                               stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if (isset($tokens[$stackPtr]['scope_opener']) === false) {
+            $error = 'Possible parse error: %s missing opening or closing brace';
+            $data  = [$tokens[$stackPtr]['content']];
+            $phpcsFile->addWarning($error, $stackPtr, 'MissingBrace', $data);
+            return;
+        }
+
+        // Determine the name of the class or interface. Note that we cannot
+        // simply look for the first T_STRING because a class name
+        // starting with the number will be multiple tokens.
+        $opener    = $tokens[$stackPtr]['scope_opener'];
+        $nameStart = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), $opener, true);
+        $nameEnd   = $phpcsFile->findNext(T_WHITESPACE, $nameStart, $opener);
+        if ($nameEnd === false) {
+            $name = $tokens[$nameStart]['content'];
+        } else {
+            $name = trim($phpcsFile->getTokensAsString($nameStart, ($nameEnd - $nameStart)));
+        }
+
+        // Check for PascalCase format.
+        $valid = $this->isCamelCaps($name);
+        if ($valid === false) {
+            $type  = ucfirst($tokens[$stackPtr]['content']);
+            $error = '%s name "%s" is not in PascalCase format';
+            $data  = [
+                $type,
+                $name,
+            ];
+            $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $data);
+            $phpcsFile->recordMetric($stackPtr, 'PascalCase class name', 'no');
+        } else {
+            $phpcsFile->recordMetric($stackPtr, 'PascalCase class name', 'yes');
+        }
+
+    }//end process()
+
+    /**
+     * Returns true if the specified string is in the camel caps format.
+     *
+     * NOTE:
+     * - it does not allow the string to start with an underscore "_"
+     * - it does allow that the string contains an underscore "_"
+     * - the string must starts with a capitol letter
+     *
+     * @param string  $string      The string the verify.
+     *
+     * @return boolean
+     */
+    private function isCamelCaps($string)
+    {
+        $legalFirstChar = '[A-Z]';
+
+        if (preg_match("/^$legalFirstChar/", $string) === 0) {
+            return false;
+        }
+
+        // Check that the name only contains legal characters.
+        $legalChars = 'a-zA-Z0-9_';
+        if (preg_match("|[^$legalChars]|", substr($string, 1)) > 0) {
+            return false;
+        }
+
+        return true;
+
+    }//end isCamelCaps()
+}//end class
+
diff --git a/tests/codesniffer/FHComplete/Sniffs/Commenting/DocBlockAlignmentSniff.php b/tests/codesniffer/FHComplete/Sniffs/Commenting/DocBlockAlignmentSniff.php
deleted file mode 100644
index 94b5a3e66..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/Commenting/DocBlockAlignmentSniff.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * FHComplete
- */
-
-/**
- * Ensures doc block alignments.
- */
-class FHComplete_Sniffs_Commenting_DocBlockAlignmentSniff implements PHP_CodeSniffer_Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_DOC_COMMENT_OPEN_TAG);
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param integer              $stackPtr  The position of the current token in the
-     *                                        stack passed in $tokens.
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $leftWall = array(
-            T_CLASS,
-            T_NAMESPACE,
-            T_INTERFACE,
-            T_TRAIT,
-            T_USE
-        );
-        $oneIndentation = array(
-            T_FUNCTION,
-            T_VARIABLE,
-            T_CONST
-        );
-        $allTokens = array_merge($leftWall, $oneIndentation);
-        $notFlatFile = $phpcsFile->findNext(T_NAMESPACE, 0);
-        $next = $phpcsFile->findNext($allTokens, $stackPtr + 1);
-
-        if ($next && $notFlatFile) {
-            $notWalled = (in_array($tokens[$next]['code'], $leftWall) && $tokens[$stackPtr]['column'] !== 1);
-            $notIndented = (in_array($tokens[$next]['code'], $oneIndentation) && $tokens[$stackPtr]['column'] !== 5);
-            if ($notWalled || $notIndented) {
-                $phpcsFile->addError('Expected docblock to be aligned with code.', $stackPtr, 'NotAllowed');
-            }
-        }
-
-        return;
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentSniff.php b/tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentSniff.php
deleted file mode 100644
index 34ea7e796..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentSniff.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-/**
- * Parses and verifies the doc comments for functions.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-if (class_exists('PEAR_Sniffs_Commenting_FunctionCommentSniff', true) === false) {
-    throw new PHP_CodeSniffer_Exception('Class PEAR_Sniffs_Commenting_FunctionCommentSniff not found');
-}
-
-/**
- * Parses and verifies the doc comments for functions.
- *
- * Verifies that :
- * <ul>
- *  <li>A comment exists</li>
- *  <li>There is a blank newline after the short description</li>
- *  <li>There is a blank newline between the long and short description</li>
- *  <li>There is a blank newline between the long description and tags</li>
- *  <li>Parameter names represent those in the method</li>
- *  <li>Parameter comments are in the correct order</li>
- *  <li>Parameter comments are complete</li>
- *  <li>A type hint is provided for array and custom class</li>
- *  <li>Type hint matches the actual variable/class type</li>
- *  <li>A blank line is present before the first and after the last parameter</li>
- *  <li>A return type exists</li>
- *  <li>Any throw tag must have a comment</li>
- *  <li>The tag order and indentation are correct</li>
- * </ul>
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @version   Release: @package_version@
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-class FHComplete_Sniffs_Commenting_FunctionCommentSniff extends PEAR_Sniffs_Commenting_FunctionCommentSniff
-{
-    /**
-     * Is the comment an inheritdoc?
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return boolean True if the comment is an inheritdoc
-     */
-    protected function isInheritDoc(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $start = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr - 1);
-        $end = $phpcsFile->findNext(T_DOC_COMMENT_CLOSE_TAG, $start);
-        $content = $phpcsFile->getTokensAsString($start, ($end - $start));
-        return preg_match('#{@inheritDoc}#', $content) === 1;
-    } // end isInheritDoc()
-
-    /**
-     * Process the return comment of this function comment.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile    The file being scanned.
-     * @param int                  $stackPtr     The position of the current token
-     *                                           in the stack passed in $tokens.
-     * @param int                  $commentStart The position in the stack where the comment started.
-     *
-     * @return void
-     */
-    protected function processReturn(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $commentStart)
-    {
-        if ($this->isInheritDoc($phpcsFile, $stackPtr)) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        // Skip constructor and destructor.
-        $className = '';
-        foreach ($tokens[$stackPtr]['conditions'] as $condPtr => $condition) {
-            if ($condition === T_CLASS || $condition === T_INTERFACE) {
-                $className = $phpcsFile->getDeclarationName($condPtr);
-                $className = strtolower(ltrim($className, '_'));
-            }
-        }
-
-        $methodName      = $phpcsFile->getDeclarationName($stackPtr);
-        $isSpecialMethod = ($methodName === '__construct' || $methodName === '__destruct');
-        if ($methodName !== '_') {
-            $methodName = strtolower(ltrim($methodName, '_'));
-        }
-
-        $return = null;
-        foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
-            if ($tokens[$tag]['content'] === '@return') {
-                if ($return !== null) {
-                    $error = 'Only 1 @return tag is allowed in a function comment';
-                    $phpcsFile->addError($error, $tag, 'DuplicateReturn');
-                    return;
-                }
-
-                $return = $tag;
-            }
-        }
-
-        if ($isSpecialMethod === true) {
-            return;
-        }
-
-        if ($return !== null) {
-            $content = $tokens[($return + 2)]['content'];
-            if (empty($content) === true || $tokens[($return + 2)]['code'] !== T_DOC_COMMENT_STRING) {
-                $error = 'Return type missing for @return tag in function comment';
-                $phpcsFile->addError($error, $return, 'MissingReturnType');
-            } else {
-                // Check return type (can be multiple, separated by '|').
-                $typeNames      = explode('|', $content);
-                $suggestedNames = array();
-                foreach ($typeNames as $i => $typeName) {
-                    if ($typeName === 'integer') {
-                        $suggestedName = 'int';
-                    } elseif ($typeName === 'boolean') {
-                        $suggestedName = 'bool';
-                    } elseif (in_array($typeName, array('int', 'bool'))) {
-                        $suggestedName = $typeName;
-                    } else {
-                        $suggestedName = PHP_CodeSniffer::suggestType($typeName);
-                    }
-                    if (in_array($suggestedName, $suggestedNames) === false) {
-                        $suggestedNames[] = $suggestedName;
-                    }
-                }
-
-                $suggestedType = implode('|', $suggestedNames);
-                if ($content !== $suggestedType) {
-                    $error = 'Function return type "%s" is invalid';
-                    $error = 'Expected "%s" but found "%s" for function return type';
-                    $data  = array(
-                              $suggestedType,
-                              $content,
-                             );
-                    $phpcsFile->addError($error, $return, 'InvalidReturn', $data);
-                }
-
-                // If the return type is void, make sure there is
-                // no return statement in the function.
-                if ($content === 'void') {
-                    if (isset($tokens[$stackPtr]['scope_closer']) === true) {
-                        $endToken = $tokens[$stackPtr]['scope_closer'];
-                        for ($returnToken = $stackPtr; $returnToken < $endToken; $returnToken++) {
-                            if ($tokens[$returnToken]['code'] === T_CLOSURE) {
-                                $returnToken = $tokens[$returnToken]['scope_closer'];
-                                continue;
-                            }
-
-                            if ($tokens[$returnToken]['code'] === T_RETURN) {
-                                break;
-                            }
-                        }
-
-                        if ($returnToken !== $endToken) {
-                            // If the function is not returning anything, just
-                            // exiting, then there is no problem.
-                            $semicolon = $phpcsFile->findNext(T_WHITESPACE, ($returnToken + 1), null, true);
-                            if ($tokens[$semicolon]['code'] !== T_SEMICOLON) {
-                                $error = 'Function return type is void, but function contains return statement';
-                                $phpcsFile->addWarning($error, $return, 'InvalidReturnVoid');
-                            }
-                        }
-                    }//end if
-                } elseif (!preg_match('/^mixed/', $content)) {
-                    // If return type is not void, there needs to be a return statement
-                    // somewhere in the function that returns something.
-                    if (isset($tokens[$stackPtr]['scope_closer']) === true) {
-                        $endToken    = $tokens[$stackPtr]['scope_closer'];
-                        $returnToken = $phpcsFile->findNext(T_RETURN, $stackPtr, $endToken);
-                        if ($returnToken === false) {
-                            $error = 'Function return type is not void, but function has no return statement';
-                            $phpcsFile->addWarning($error, $return, 'InvalidNoReturn');
-                        } elseif (!preg_match('/void/', $content)) {
-                            $semicolon = $phpcsFile->findNext(T_WHITESPACE, ($returnToken + 1), null, true);
-                            if ($tokens[$semicolon]['code'] === T_SEMICOLON) {
-                                $error = 'Function return type is not void, but function is returning void here';
-                                $phpcsFile->addWarning($error, $returnToken, 'InvalidReturnNotVoid');
-                            }
-                        }
-                    }
-                }//end if
-            }//end if
-        } else {
-            $error = 'Missing @return tag in function comment';
-            $phpcsFile->addWarning($error, $tokens[$commentStart]['comment_closer'], 'MissingReturn');
-        }//end if
-
-    }//end processReturn()
-
-
-    /**
-     * Process any throw tags that this function comment has.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile    The file being scanned.
-     * @param int                  $stackPtr     The position of the current token
-     *                                           in the stack passed in $tokens.
-     * @param int                  $commentStart The position in the stack where the comment started.
-     *
-     * @return void
-     */
-    protected function processThrows(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $commentStart)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $throws = array();
-        foreach ($tokens[$commentStart]['comment_tags'] as $pos => $tag) {
-            if ($tokens[$tag]['content'] !== '@throws') {
-                continue;
-            }
-
-            $exception = null;
-            $comment   = null;
-            if ($tokens[($tag + 2)]['code'] === T_DOC_COMMENT_STRING) {
-                $matches = array();
-                preg_match('/([^\s]+)(?:\s+(.*))?/', $tokens[($tag + 2)]['content'], $matches);
-                $exception = $matches[1];
-                if (isset($matches[2]) === true) {
-                    $comment = $matches[2];
-                }
-            }
-
-            if ($exception === null) {
-                $error = 'Exception type and comment missing for @throws tag in function comment';
-                $phpcsFile->addWarning($error, $tag, 'InvalidThrows');
-            } elseif ($comment === null) {
-                $error = 'Comment missing for @throws tag in function comment';
-                $phpcsFile->addWarning($error, $tag, 'EmptyThrows');
-            } else {
-                // Any strings until the next tag belong to this comment.
-                if (isset($tokens[$commentStart]['comment_tags'][($pos + 1)]) === true) {
-                    $end = $tokens[$commentStart]['comment_tags'][($pos + 1)];
-                } else {
-                    $end = $tokens[$commentStart]['comment_closer'];
-                }
-
-                for ($i = ($tag + 3); $i < $end; $i++) {
-                    if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) {
-                        $comment .= ' '.$tokens[$i]['content'];
-                    }
-                }
-
-                // Starts with a capital letter and ends with a fullstop.
-                $firstChar = $comment{0};
-                if (strtoupper($firstChar) !== $firstChar) {
-                    $error = '@throws tag comment must start with a capital letter';
-                    $phpcsFile->addWarning($error, ($tag + 2), 'ThrowsNotCapital');
-                }
-
-                $lastChar = substr($comment, -1);
-                if ($lastChar !== '.') {
-                    $error = '@throws tag comment must end with a full stop';
-                    $phpcsFile->addWarning($error, ($tag + 2), 'ThrowsNoFullStop');
-                }
-            }//end if
-        }//end foreach
-
-    }//end processThrows()
-
-
-    /**
-     * Process the function parameter comments.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile    The file being scanned.
-     * @param int                  $stackPtr     The position of the current token
-     *                                           in the stack passed in $tokens.
-     * @param int                  $commentStart The position in the stack where the comment started.
-     *
-     * @return void
-     */
-    protected function processParams(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $commentStart)
-    {
-        if ($this->isInheritDoc($phpcsFile, $stackPtr)) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        $params  = array();
-        $maxType = 0;
-        $maxVar  = 0;
-        foreach ($tokens[$commentStart]['comment_tags'] as $pos => $tag) {
-            if ($tokens[$tag]['content'] !== '@param') {
-                continue;
-            }
-
-            $type         = '';
-            $typeSpace    = 0;
-            $var          = '';
-            $varSpace     = 0;
-            $comment      = '';
-            $commentLines = array();
-            if ($tokens[($tag + 2)]['code'] === T_DOC_COMMENT_STRING) {
-                $matches = array();
-                preg_match('/([^$&]+)(?:((?:\$|&)[^\s]+)(?:(\s+)(.*))?)?/', $tokens[($tag + 2)]['content'], $matches);
-
-                $typeLen   = strlen($matches[1]);
-                $type      = trim($matches[1]);
-                $typeSpace = ($typeLen - strlen($type));
-                $typeLen   = strlen($type);
-                if ($typeLen > $maxType) {
-                    $maxType = $typeLen;
-                }
-
-                if (isset($matches[2]) === true) {
-                    $var    = $matches[2];
-                    $varLen = strlen($var);
-                    if ($varLen > $maxVar) {
-                        $maxVar = $varLen;
-                    }
-
-                    if (isset($matches[4]) === true) {
-                        $varSpace       = strlen($matches[3]);
-                        $comment        = $matches[4];
-                        $commentLines[] = array(
-                                           'comment' => $comment,
-                                           'token'   => ($tag + 2),
-                                           'indent'  => $varSpace,
-                                          );
-
-                        // Any strings until the next tag belong to this comment.
-                        if (isset($tokens[$commentStart]['comment_tags'][($pos + 1)]) === true) {
-                            $end = $tokens[$commentStart]['comment_tags'][($pos + 1)];
-                        } else {
-                            $end = $tokens[$commentStart]['comment_closer'];
-                        }
-
-                        for ($i = ($tag + 3); $i < $end; $i++) {
-                            if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) {
-                                $indent = 0;
-                                if ($tokens[($i - 1)]['code'] === T_DOC_COMMENT_WHITESPACE) {
-                                    $indent = strlen($tokens[($i - 1)]['content']);
-                                }
-
-                                $comment       .= ' '.$tokens[$i]['content'];
-                                $commentLines[] = array(
-                                                   'comment' => $tokens[$i]['content'],
-                                                   'token'   => $i,
-                                                   'indent'  => $indent,
-                                                  );
-                            }
-                        }
-                    } else {
-                        $error = 'Missing parameter comment';
-                        $phpcsFile->addError($error, $tag, 'MissingParamComment');
-                        $commentLines[] = array('comment' => '');
-                    }//end if
-                } else {
-                    $error = 'Missing parameter name';
-                    $phpcsFile->addError($error, $tag, 'MissingParamName');
-                }//end if
-            } else {
-                $error = 'Missing parameter type';
-                $phpcsFile->addError($error, $tag, 'MissingParamType');
-            }//end if
-
-            $params[] = array(
-                         'tag'          => $tag,
-                         'type'         => $type,
-                         'var'          => $var,
-                         'comment'      => $comment,
-                         'commentLines' => $commentLines,
-                         'type_space'   => $typeSpace,
-                         'var_space'    => $varSpace,
-                        );
-        }//end foreach
-
-        $realParams  = $phpcsFile->getMethodParameters($stackPtr);
-        $foundParams = array();
-
-        foreach ($params as $pos => $param) {
-            // If the type is empty, the whole line is empty.
-            if ($param['type'] === '') {
-                continue;
-            }
-
-            // Check the param type value.
-            $typeNames = explode('|', $param['type']);
-            foreach ($typeNames as $typeName) {
-                if ($typeName === 'integer') {
-                    $suggestedName = 'int';
-                } elseif ($typeName === 'boolean') {
-                    $suggestedName = 'bool';
-                } elseif (in_array($typeName, array('int', 'bool'))) {
-                    $suggestedName = $typeName;
-                } else {
-                    $suggestedName = PHP_CodeSniffer::suggestType($typeName);
-                }
-
-                if ($typeName !== $suggestedName) {
-                    $error = 'Expected "%s" but found "%s" for parameter type';
-                    $data  = array(
-                              $suggestedName,
-                              $typeName,
-                             );
-
-                    $fix = $phpcsFile->addFixableError($error, $param['tag'], 'IncorrectParamVarName', $data);
-                    if ($fix === true) {
-                        $content  = $suggestedName;
-                        $content .= str_repeat(' ', $param['type_space']);
-                        $content .= $param['var'];
-                        $content .= str_repeat(' ', $param['var_space']);
-                        $content .= $param['commentLines'][0]['comment'];
-                        $phpcsFile->fixer->replaceToken(($param['tag'] + 2), $content);
-                    }
-                }
-            }//end foreach
-
-            if ($param['var'] === '') {
-                continue;
-            }
-
-            $foundParams[] = $param['var'];
-
-            // Make sure the param name is correct.
-            if (isset($realParams[$pos]) === true) {
-                $realName = $realParams[$pos]['name'];
-                if ($realName !== $param['var']) {
-                    $code = 'ParamNameNoMatch';
-                    $data = array(
-                             $param['var'],
-                             $realName,
-                            );
-
-                    $error = 'Doc comment for parameter %s does not match ';
-                    if (strtolower($param['var']) === strtolower($realName)) {
-                        $error .= 'case of ';
-                        $code   = 'ParamNameNoCaseMatch';
-                    }
-
-                    $error .= 'actual variable name %s';
-
-                    $phpcsFile->addWarning($error, $param['tag'], $code, $data);
-                }
-            } elseif (substr($param['var'], -4) !== ',...') {
-                // We must have an extra parameter comment.
-                $error = 'Superfluous parameter comment';
-                $phpcsFile->addError($error, $param['tag'], 'ExtraParamComment');
-            }//end if
-
-            if ($param['comment'] === '') {
-                continue;
-            }
-
-            // Param comments must start with a capital letter and end with the full stop.
-            $firstChar = $param['comment']{0};
-            if (preg_match('|\p{Lu}|u', $firstChar) === 0) {
-                $error = 'Parameter comment must start with a capital letter';
-                $phpcsFile->addWarning($error, $param['tag'], 'ParamCommentNotCapital');
-            }
-
-            $lastChar = substr($param['comment'], -1);
-            if ($lastChar !== '.') {
-                $error = 'Parameter comment must end with a full stop';
-                $phpcsFile->addWarning($error, $param['tag'], 'ParamCommentFullStop');
-            }
-        }//end foreach
-
-        $realNames = array();
-        foreach ($realParams as $realParam) {
-            $realNames[] = $realParam['name'];
-        }
-
-        // Report missing comments.
-        $diff = array_diff($realNames, $foundParams);
-        foreach ($diff as $neededParam) {
-            $error = 'Doc comment for parameter "%s" missing';
-            $data  = array($neededParam);
-            $phpcsFile->addWarning($error, $commentStart, 'MissingParamTag', $data);
-        }
-
-    }//end processParams()
-}//end class
diff --git a/tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentTypeSniff.php b/tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentTypeSniff.php
deleted file mode 100644
index 722661165..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentTypeSniff.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * FHComplete
- */
-
-/**
- * Asserts that function comments use the short form for types:
- * - bool instead of boolean
- * - int instead of integer
- */
-class FHComplete_Sniffs_Commenting_FunctionCommentTypeSniff implements PHP_CodeSniffer_Sniff {
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_DOC_COMMENT);
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int $stackPtr The position of the current token
-     * in the stack passed in $tokens.
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // We are only interested in function/class/interface doc block comments.
-        $nextToken = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        $ignore = array(
-            T_CLASS,
-            T_INTERFACE,
-            T_FUNCTION,
-            T_PUBLIC,
-            T_PRIVATE,
-            T_PROTECTED,
-            T_STATIC,
-            T_ABSTRACT,
-        );
-
-        if (in_array($tokens[$nextToken]['code'], $ignore) === false) {
-            // Could be a file comment.
-            $prevToken = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-            if ($tokens[$prevToken]['code'] !== T_OPEN_TAG) {
-                return;
-            }
-        }
-
-        $types = array(
-            'boolean' => 'bool',
-            'integer' => 'int',
-        );
-        foreach ($types as $from => $to) {
-            $this->_check($phpcsFile, $stackPtr, $from, $to);
-        }
-    }
-
-    /**
-     * MyFHComplete_Sniffs_Commenting_DocBlockTypeSniff::_check()
-     *
-     * @param int $stackPtr
-     * @param string $from
-     * @param string $to
-     * @return void
-     */
-    protected function _check(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $from, $to)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $content = $tokens[$stackPtr]['content'];
-
-        $matches = array();
-        if (preg_match('/\@(\w+)\s+([\w\\|\\\\]*?)' . $from . '\b/i', $content, $matches) === 0) {
-            return;
-        }
-
-        $error = 'Please use "' . $to . '" instead of "' . $from . '" for types in doc blocks.';
-        $phpcsFile->addWarning($error, $stackPtr, 'WrongType');
-    }
-
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/ControlStructures/ControlSignatureSniff.php b/tests/codesniffer/FHComplete/Sniffs/ControlStructures/ControlSignatureSniff.php
deleted file mode 100644
index 6b2f483d0..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Verifies that control statements conform to their coding standards.
- *
- * PHP version 5
- */
-
-if (class_exists('PHP_CodeSniffer_Standards_AbstractPatternSniff', true) === false) {
-    throw new PHP_CodeSniffer_Exception('Class PHP_CodeSniffer_Standards_AbstractPatternSniff not found');
-}
-
-/**
- * Verifies that control statements conform to their coding standards.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @version   Release: @package_version@
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-class FHComplete_Sniffs_ControlStructures_ControlSignatureSniff extends PHP_CodeSniffer_Standards_AbstractPatternSniff
-{
-
-    /**
-     * If true, comments will be ignored if they are found in the code.
-     *
-     * @var boolean
-     */
-    public $ignoreComments = true;
-
-
-    /**
-     * Returns the patterns that this test wishes to verify.
-     *
-     * @return string[]
-     */
-    protected function getPatterns()
-    {
-        return array(
-            'tryEOL...{EOL...}EOL...catch (...)EOL...{EOL...}EOL',
-            'doEOL...{EOL...EOL...}EOL...while (...);EOL',
-            'while (...)EOL...{EOL',
-            'for (...)EOL...{EOL',
-            'if (...)EOL...{EOL',
-            'foreach (...)EOL...{EOL',
-            '}EOL...\s+else if (...)EOL...{EOL',
-            '}EOL...\s+elseif (...)EOL...{EOL',
-            '}EOL...\s+else+EOL...{EOL',
-            'doEOL...{EOL',
-       );
-
-    }//end getPatterns()
-
-
-}//end class
diff --git a/tests/codesniffer/FHComplete/Sniffs/ControlStructures/ElseIfDeclarationSniff.php b/tests/codesniffer/FHComplete/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
deleted file mode 100644
index 1ef2f2aaf..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Ensures that elseif is used instead of else if
- *
- */
-class FHComplete_Sniffs_ControlStructures_ElseIfDeclarationSniff implements PHP_CodeSniffer_Sniff
-{
-
-/**
- * Returns an array of tokens this test wants to listen for.
- *
- * @return array
- */
-    public function register()
-    {
-        return array(T_ELSE);
-    }
-
-/**
- * Processes this test, when one of its tokens is encountered.
- *
- * Checks that ELSEIF is used instead of ELSE IF.
- *
- * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
- * @param integer              $stackPtr  The position of the current token in the
- *                                        stack passed in $tokens.
- * @return void
- */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $nextToken = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$nextToken]['code'] !== T_IF) {
-            return;
-        }
-
-        $error = 'Usage of ELSE IF not allowed; use ELSEIF instead';
-        $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
-    }
-
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/ControlStructures/FHCControlSignatureSniff.php b/tests/codesniffer/FHComplete/Sniffs/ControlStructures/FHCControlSignatureSniff.php
new file mode 100644
index 000000000..e53ec67b1
--- /dev/null
+++ b/tests/codesniffer/FHComplete/Sniffs/ControlStructures/FHCControlSignatureSniff.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Verifies that control statements conform to their coding standards.
+ *
+ * NOTE: It simply overrides the method process of the PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures\ControlSignatureSniff class
+ *
+ */
+
+namespace PHP_CodeSniffer\Standards\FHComplete\Sniffs\ControlStructures;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Tokens;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures\ControlSignatureSniff;
+
+class FHCControlSignatureSniff extends ControlSignatureSniff
+{
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * NOTE:
+     * - Does not force to have whitespaces after the brackets
+     * - Allows to have a bracket at newline after a control structure, ex:
+     * 
+     *     if (condition)
+     *     {
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token in the
+     *                                               stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+        if ($nextNonEmpty === false) {
+            return;
+        }
+
+        $isAlternative = false;
+        if (isset($tokens[$stackPtr]['scope_opener']) === true
+            && $tokens[$tokens[$stackPtr]['scope_opener']]['code'] === T_COLON
+        ) {
+            $isAlternative = true;
+        }
+
+        // Single newline after opening brace.
+        if (isset($tokens[$stackPtr]['scope_opener']) === true) {
+            $opener = $tokens[$stackPtr]['scope_opener'];
+            for ($next = ($opener + 1); $next < $phpcsFile->numTokens; $next++) {
+                $code = $tokens[$next]['code'];
+
+                if ($code === T_WHITESPACE
+                    || ($code === T_INLINE_HTML
+                    && trim($tokens[$next]['content']) === '')
+                ) {
+                    continue;
+                }
+
+                // Skip all empty tokens on the same line as the opener.
+                if ($tokens[$next]['line'] === $tokens[$opener]['line']
+                    && (isset(Tokens::$emptyTokens[$code]) === true
+                    || $code === T_CLOSE_TAG)
+                ) {
+                    continue;
+                }
+
+                // We found the first bit of a code, or a comment on the
+                // following line.
+                break;
+            }//end for
+
+            if ($tokens[$next]['line'] === $tokens[$opener]['line']) {
+                $error = 'Newline required after opening brace';
+                $fix   = $phpcsFile->addFixableError($error, $opener, 'NewlineAfterOpenBrace');
+                if ($fix === true) {
+                    $phpcsFile->fixer->beginChangeset();
+                    for ($i = ($opener + 1); $i < $next; $i++) {
+                        if (trim($tokens[$i]['content']) !== '') {
+                            break;
+                        }
+
+                        // Remove whitespace.
+                        $phpcsFile->fixer->replaceToken($i, '');
+                    }
+
+                    $phpcsFile->fixer->addContent($opener, $phpcsFile->eolChar);
+                    $phpcsFile->fixer->endChangeset();
+                }
+            }//end if
+        } else if ($tokens[$stackPtr]['code'] === T_WHILE) {
+            // Zero spaces after parenthesis closer, but only if followed by a semicolon.
+            $closer       = $tokens[$stackPtr]['parenthesis_closer'];
+            $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($closer + 1), null, true);
+            if ($nextNonEmpty !== false && $tokens[$nextNonEmpty]['code'] === T_SEMICOLON) {
+                $found = 0;
+                if ($tokens[($closer + 1)]['code'] === T_WHITESPACE) {
+                    if (strpos($tokens[($closer + 1)]['content'], $phpcsFile->eolChar) !== false) {
+                        $found = 'newline';
+                    } else {
+                        $found = $tokens[($closer + 1)]['length'];
+                    }
+                }
+
+                if ($found !== 0) {
+                    $error = 'Expected 0 spaces before semicolon; %s found';
+                    $data  = [$found];
+                    $fix   = $phpcsFile->addFixableError($error, $closer, 'SpaceBeforeSemicolon', $data);
+                    if ($fix === true) {
+                        $phpcsFile->fixer->replaceToken(($closer + 1), '');
+                    }
+                }
+            }
+        }//end if
+
+        // Only want to check multi-keyword structures from here on.
+        if ($tokens[$stackPtr]['code'] === T_WHILE) {
+            if (isset($tokens[$stackPtr]['scope_closer']) !== false) {
+                return;
+            }
+
+            $closer = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+            if ($closer === false
+                || $tokens[$closer]['code'] !== T_CLOSE_CURLY_BRACKET
+                || $tokens[$tokens[$closer]['scope_condition']]['code'] !== T_DO
+            ) {
+                return;
+            }
+        } else if ($tokens[$stackPtr]['code'] === T_ELSE
+            || $tokens[$stackPtr]['code'] === T_ELSEIF
+            || $tokens[$stackPtr]['code'] === T_CATCH
+            || $tokens[$stackPtr]['code'] === T_FINALLY
+        ) {
+            if (isset($tokens[$stackPtr]['scope_opener']) === true
+                && $tokens[$tokens[$stackPtr]['scope_opener']]['code'] === T_COLON
+            ) {
+                // Special case for alternate syntax, where this token is actually
+                // the closer for the previous block, so there is no spacing to check.
+                return;
+            }
+
+            $closer = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+            if ($closer === false || $tokens[$closer]['code'] !== T_CLOSE_CURLY_BRACKET) {
+                return;
+            }
+        } else {
+            return;
+        }//end if
+    }//end process()
+}//end class
+
diff --git a/tests/codesniffer/FHComplete/Sniffs/ControlStructures/WhileStructuresSniff.php b/tests/codesniffer/FHComplete/Sniffs/ControlStructures/WhileStructuresSniff.php
deleted file mode 100644
index 421f86ba6..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/ControlStructures/WhileStructuresSniff.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Ensures that while and do-while use curly brackets
- *
- */
-class FHComplete_Sniffs_ControlStructures_WhileStructuresSniff implements PHP_CodeSniffer_Sniff
-{
-
-/**
- * Returns an array of tokens this test wants to listen for.
- *
- * @return array
- */
-    public function register()
-    {
-        return array(T_DO, T_WHILE);
-    }
-
-/**
- * Processes this test, when one of its tokens is encountered.
- *
- * Checks that while and do-while use curly brackets
- *
- * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
- * @param integer              $stackPtr  The position of the current token in the
- *                                        stack passed in $tokens.
- * @return void
- */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $nextToken = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$nextToken]['code'] === T_OPEN_PARENTHESIS) {
-            $closer = $tokens[$nextToken]['parenthesis_closer'];
-            $diff = $closer - $stackPtr;
-            $nextToken = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + $diff + 1), null, true);
-        }
-
-        if ($tokens[$stackPtr]['code'] === T_WHILE && $tokens[$nextToken]['code'] === T_SEMICOLON) {
-            /* This while is probably part of a do-while construction, skip it .. */
-            return;
-        }
-        if ($tokens[$nextToken]['code'] !== T_OPEN_CURLY_BRACKET && $tokens[$nextToken]['code'] !== T_COLON) {
-            $error = 'Curly brackets required in a do-while or while loop';
-            $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
-        }
-    }
-
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/Formatting/OneClassPerUseSniff.php b/tests/codesniffer/FHComplete/Sniffs/Formatting/OneClassPerUseSniff.php
deleted file mode 100644
index 2b2ee37e6..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/Formatting/OneClassPerUseSniff.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Ensures the use contains only one class.
- *
- */
-class FHComplete_Sniffs_Formatting_OneClassPerUseSniff implements PHP_CodeSniffer_Sniff
-{
-
-/**
- * Returns an array of tokens this test wants to listen for.
- *
- * @return array
- */
-    public function register()
-    {
-        return array(T_USE);
-    }
-
-/**
- * Processes this test, when one of its tokens is encountered.
- *
- * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
- * @param integer $stackPtr  The position of the current token in the stack passed in $tokens.
- * @return void
- */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $i = 2; // Ignore use word and whitespace
-        $filename = $phpcsFile->getFilename();
-
-        while (in_array($tokens[$stackPtr + $i]['code'], array(T_STRING, T_NS_SEPARATOR, T_WHITESPACE, T_AS))) {
-            $i++;
-        }
-
-        if ($tokens[$stackPtr + $i]['code'] === T_COMMA) {
-            $error = 'Only one class is allowed per use';
-            $phpcsFile->addError($error, $stackPtr, 'OneClassPerUse', array());
-        }
-    }
-
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php b/tests/codesniffer/FHComplete/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php
deleted file mode 100644
index 43da15876..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Ensures all the use are in alphabetical order.
- *
- */
-class FHComplete_Sniffs_Formatting_UseInAlphabeticalOrderSniff implements PHP_CodeSniffer_Sniff
-{
-
-/**
- * Processed files
- *
- * @var array
- */
-    protected $_processed = array();
-
-/**
- * The list of use statements, their content and scope.
- *
- * @var array
- */
-    protected $_uses = array();
-
-/**
- * Returns an array of tokens this test wants to listen for.
- *
- * @return array
- */
-    public function register()
-    {
-        return array(T_USE);
-    }
-
-/**
- * Processes this test, when one of its tokens is encountered.
- *
- * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
- * @param integer $stackPtr The position of the current token in the stack passed in $tokens.
- * @return void
- */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        if (isset($this->_processed[$phpcsFile->getFilename()])) {
-            return;
-        }
-        $filename = $phpcsFile->getFilename();
-
-        $this->_uses = array();
-        $next = $stackPtr;
-
-        while ($next !== false) {
-            $this->_checkUseToken($phpcsFile, $next);
-            $next = $phpcsFile->findNext(T_USE, $next + 1);
-        }
-
-        // Prevent multiple uses in the same file from entering
-        $this->_processed[$phpcsFile->getFilename()] = true;
-
-        foreach ($this->_uses as $scope => $used) {
-            $defined = $sorted = array_keys($used);
-
-            natcasesort($sorted);
-            $sorted = array_values($sorted);
-            if ($sorted === $defined) {
-                continue;
-            }
-
-            foreach ($defined as $i => $name) {
-                if ($name !== $sorted[$i]) {
-                    $error = 'Use classes must be in alphabetical order. Was expecting ' . $sorted[$i];
-                    $phpcsFile->addError($error, $used[$name], 'UseInAlphabeticalOrder', array());
-                }
-            }
-        }
-    }
-
-/**
- * Check all the use tokens in a file.
- *
- * @param PHP_CodeSniffer_File $phpcsFile The file to check.
- * @param integer $stackPtr The index of the first use token.
- * @return void
- */
-    protected function _checkUseToken($phpcsFile, $stackPtr) {
-        // If the use token is for a closure we want to ignore it.
-        $isClosure = $this->_isClosure($phpcsFile, $stackPtr);
-        if ($isClosure) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        // Only one USE declaration allowed per statement.
-        $next = $phpcsFile->findNext(array(T_COMMA, T_SEMICOLON), ($stackPtr + 1));
-        if ($tokens[$next]['code'] === T_COMMA) {
-            $error = 'There must be one USE keyword per declaration';
-            $phpcsFile->addError($error, $stackPtr, 'MultipleDeclarations');
-        }
-
-        $content = '';
-        $end = $phpcsFile->findNext(array(T_SEMICOLON, T_OPEN_CURLY_BRACKET), $stackPtr);
-        $useTokens = array_slice($tokens, $stackPtr, $end - $stackPtr, true);
-
-        foreach ($useTokens as $index => $token) {
-            if ($token['code'] === T_STRING || $token['code'] === T_NS_SEPARATOR) {
-                $content .= $token['content'];
-            }
-        }
-
-        // Check for class scoping on use. Traits should be
-        // ordered independently.
-        $scope = 0;
-        if (!empty($token['conditions'])) {
-            $scope = key($token['conditions']);
-        }
-        $this->_uses[$scope][$content] = $stackPtr;
-    }
-
-/**
- * Check if the current stackPtr is a use token that is for a closure.
- *
- * @param PHP_CodeSniffer_File $phpcsFile
- * @param integer $stackPtr
- * @return boolean
- */
-    protected function _isClosure($phpcsFile, $stackPtr) {
-        return $phpcsFile->findPrevious(
-            array(T_CLOSURE),
-            ($stackPtr - 1),
-            null,
-            false,
-            null,
-            true
-        );
-    }
-
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/Functions/ClosureDeclarationSniff.php b/tests/codesniffer/FHComplete/Sniffs/Functions/ClosureDeclarationSniff.php
deleted file mode 100644
index 6582d3011..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/Functions/ClosureDeclarationSniff.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Ensures there is a space after the function keyword for closures.
- *
- */
-class FHComplete_Sniffs_Functions_ClosureDeclarationSniff implements PHP_CodeSniffer_Sniff {
-
-    public function register()
-    {
-        return array(T_CLOSURE);
-    }
-
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $spaces = 0;
-
-        if ($tokens[($stackPtr + 1)]['code'] === T_WHITESPACE) {
-            $spaces = strlen($tokens[($stackPtr + 1)]['content']);
-        }
-
-        if ($spaces !== 1) {
-            $error = 'Expected 1 space after closure\'s function keyword; %s found';
-            $data  = array($spaces);
-            $phpcsFile->addError($error, $stackPtr, 'SpaceAfterFunction', $data);
-        }
-    }
-
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php b/tests/codesniffer/FHComplete/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
deleted file mode 100644
index 260ad1c10..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-if (class_exists('Squiz_Sniffs_Functions_FunctionDeclarationArgumentSpacingSniff', true) === false) {
-    $error = 'Class Squiz_Sniffs_Functions_FunctionDeclarationArgumentSpacingSniff not found';
-    throw new PHP_CodeSniffer_Exception($error);
-}
-
-/**
- * Ensures the spacing of function declaration arguments is correct.
- *
- */
-class FHComplete_Sniffs_Functions_FunctionDeclarationArgumentSpacingSniff extends
-    Squiz_Sniffs_Functions_FunctionDeclarationArgumentSpacingSniff {
-
-    /**
-     * How many spaces should surround the equals signs.
-     *
-     * @var int
-     */
-    public $equalsSpacing = 1;
-
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/Methods/FHCMethodDeclarationSniff.php b/tests/codesniffer/FHComplete/Sniffs/Methods/FHCMethodDeclarationSniff.php
new file mode 100644
index 000000000..4008b2cf1
--- /dev/null
+++ b/tests/codesniffer/FHComplete/Sniffs/Methods/FHCMethodDeclarationSniff.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Checks that the method declaration is correct.
+ *
+ * NOTE: It simply overrides the method processTokenWithinScope of the Standards\PSR2\Sniffs\Methods\MethodDeclarationSniff class
+ *
+ */
+
+namespace PHP_CodeSniffer\Standards\FHComplete\Sniffs\Methods;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\AbstractScopeSniff;
+use PHP_CodeSniffer\Util\Tokens;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\MethodDeclarationSniff;
+
+class FHCMethodDeclarationSniff extends MethodDeclarationSniff
+{
+    /**
+     * Processes the function tokens within the class.
+     *
+     * NOTE: it does not check if the method name starts with an underscore "_"
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+     * @param int                         $stackPtr  The position where the token was found.
+     * @param int                         $currScope The current scope opener token.
+     *
+     * @return void
+     */
+    protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        // Determine if this is a function which needs to be examined.
+        $conditions = $tokens[$stackPtr]['conditions'];
+        end($conditions);
+        $deepestScope = key($conditions);
+        if ($deepestScope !== $currScope) {
+            return;
+        }
+
+        $methodName = $phpcsFile->getDeclarationName($stackPtr);
+        if ($methodName === null) {
+            // Ignore closures.
+            return;
+        }
+
+        $visibility = 0;
+        $static     = 0;
+        $abstract   = 0;
+        $final      = 0;
+
+        $find = (Tokens::$methodPrefixes + Tokens::$emptyTokens);
+        $prev = $phpcsFile->findPrevious($find, ($stackPtr - 1), null, true);
+
+        $prefix = $stackPtr;
+        while (($prefix = $phpcsFile->findPrevious(Tokens::$methodPrefixes, ($prefix - 1), $prev)) !== false) {
+            switch ($tokens[$prefix]['code']) {
+            case T_STATIC:
+                $static = $prefix;
+                break;
+            case T_ABSTRACT:
+                $abstract = $prefix;
+                break;
+            case T_FINAL:
+                $final = $prefix;
+                break;
+            default:
+                $visibility = $prefix;
+                break;
+            }
+        }
+
+        $fixes = [];
+
+        if ($visibility !== 0 && $final > $visibility) {
+            $error = 'The final declaration must precede the visibility declaration';
+            $fix   = $phpcsFile->addFixableError($error, $final, 'FinalAfterVisibility');
+            if ($fix === true) {
+                $fixes[$final]       = '';
+                $fixes[($final + 1)] = '';
+                if (isset($fixes[$visibility]) === true) {
+                    $fixes[$visibility] = 'final '.$fixes[$visibility];
+                } else {
+                    $fixes[$visibility] = 'final '.$tokens[$visibility]['content'];
+                }
+            }
+        }
+
+        if ($visibility !== 0 && $abstract > $visibility) {
+            $error = 'The abstract declaration must precede the visibility declaration';
+            $fix   = $phpcsFile->addFixableError($error, $abstract, 'AbstractAfterVisibility');
+            if ($fix === true) {
+                $fixes[$abstract]       = '';
+                $fixes[($abstract + 1)] = '';
+                if (isset($fixes[$visibility]) === true) {
+                    $fixes[$visibility] = 'abstract '.$fixes[$visibility];
+                } else {
+                    $fixes[$visibility] = 'abstract '.$tokens[$visibility]['content'];
+                }
+            }
+        }
+
+        if ($static !== 0 && $static < $visibility) {
+            $error = 'The static declaration must come after the visibility declaration';
+            $fix   = $phpcsFile->addFixableError($error, $static, 'StaticBeforeVisibility');
+            if ($fix === true) {
+                $fixes[$static]       = '';
+                $fixes[($static + 1)] = '';
+                if (isset($fixes[$visibility]) === true) {
+                    $fixes[$visibility] .= ' static';
+                } else {
+                    $fixes[$visibility] = $tokens[$visibility]['content'].' static';
+                }
+            }
+        }
+
+        // Batch all the fixes together to reduce the possibility of conflicts.
+        if (empty($fixes) === false) {
+            $phpcsFile->fixer->beginChangeset();
+            foreach ($fixes as $stackPtr => $content) {
+                $phpcsFile->fixer->replaceToken($stackPtr, $content);
+            }
+
+            $phpcsFile->fixer->endChangeset();
+        }
+
+    }//end processTokenWithinScope()
+}//end class
+
diff --git a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/CamelCapsMethodNameSniff.php b/tests/codesniffer/FHComplete/Sniffs/NamingConventions/CamelCapsMethodNameSniff.php
deleted file mode 100644
index e99f05e04..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/CamelCapsMethodNameSniff.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * PSR1_Sniffs_Methods_CamelCapsMethodNameSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-if (class_exists('Generic_Sniffs_NamingConventions_CamelCapsFunctionNameSniff', true) === false) {
-    throw new PHP_CodeSniffer_Exception('Class Generic_Sniffs_NamingConventions_CamelCapsFunctionNameSniff not found');
-}
-
-/**
- * PSR1_Sniffs_Methods_CamelCapsMethodNameSniff.
- *
- * Ensures method names are defined using camel case.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @version   Release: @package_version@
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-class FHComplete_Sniffs_NamingConventions_CamelCapsMethodNameSniff extends Generic_Sniffs_NamingConventions_CamelCapsFunctionNameSniff
-{
-
-
-    /**
-     * Processes the tokens within the scope.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being processed.
-     * @param int                  $stackPtr  The position where this token was
-     *                                        found.
-     * @param int                  $currScope The position of the current scope.
-     *
-     * @return void
-     */
-    protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $currScope)
-    {
-        $methodName = $phpcsFile->getDeclarationName($stackPtr);
-        if ($methodName === null 
-			|| substr($methodName,-4) === '_get'
-			|| substr($methodName,-5) === '_post'
-			|| substr($methodName,-4) === '_put'
-			|| substr($methodName,-6) === '_patch'
-			|| substr($methodName,-7) === '_delete'
-			) 
-            // Ignore closures.
-            return;
-
-        // Ignore magic methods.
-        if (preg_match('|^__|', $methodName) !== 0) {
-            $magicPart = strtolower(substr($methodName, 2));
-            if (isset($this->magicMethods[$magicPart]) === true
-                || isset($this->methodsDoubleUnderscore[$magicPart]) === true
-            ) {
-                return;
-            }
-        }
-
-        $testName = ltrim($methodName, '_');
-        if ($testName !== '' && PHP_CodeSniffer::isCamelCaps($testName, false, true, false) === false) {
-            $error     = 'Method name "%s" is not in camel caps format';
-            $className = $phpcsFile->getDeclarationName($currScope);
-            $errorData = array($className.'::'.$methodName);
-            $phpcsFile->addWarning($error, $stackPtr, 'NotCamelCaps', $errorData);
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'no');
-        } else {
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes');
-        }
-
-    }//end processTokenWithinScope()
-
-
-    /**
-     * Processes the tokens outside the scope.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being processed.
-     * @param int                  $stackPtr  The position where this token was
-     *                                        found.
-     *
-     * @return void
-     */
-    protected function processTokenOutsideScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-
-    }//end processTokenOutsideScope()
-
-
-}//end class
diff --git a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php b/tests/codesniffer/FHComplete/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
deleted file mode 100644
index 3137ea8cf..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * FHComplete_Sniffs_NamingConventions_UpperCaseConstantNameSniff.
- *
- * PHP version 5
- *
- * Ensures that constant names are all uppercase.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @version   Release: 1.5.0RC3
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-class FHComplete_Sniffs_NamingConventions_UpperCaseConstantNameSniff implements PHP_CodeSniffer_Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_STRING);
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param integer              $stackPtr  The position of the current token in the
-     *                                        stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $constName = $tokens[$stackPtr]['content'];
-
-        // If this token is in a heredoc, ignore it.
-        if ($phpcsFile->hasCondition($stackPtr, T_START_HEREDOC) === true) {
-            return;
-        }
-
-        // Special case for PHPUnit.
-        if ($constName === 'PHPUnit_MAIN_METHOD') {
-            return;
-        }
-
-        // If the next non-whitespace token after this token
-        // is not an opening parenthesis then it is not a function call.
-        $openBracket = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$openBracket]['code'] !== T_OPEN_PARENTHESIS) {
-            $functionKeyword = $phpcsFile->findPrevious(
-                array(
-                    T_WHITESPACE,
-                    T_COMMA,
-                    T_COMMENT,
-                    T_STRING,
-                    T_NS_SEPARATOR,
-                ),
-                ($stackPtr - 1),
-                null,
-                true
-            );
-
-            $declarations = array(
-                T_FUNCTION,
-                T_CLASS,
-                T_INTERFACE,
-                T_TRAIT,
-                T_IMPLEMENTS,
-                T_EXTENDS,
-                T_INSTANCEOF,
-                T_NEW,
-                T_NAMESPACE,
-                T_USE,
-                T_AS,
-                T_GOTO,
-                T_INSTEADOF,
-                T_PROTECTED,
-                T_PRIVATE,
-                T_PUBLIC
-            );
-
-            if (in_array($tokens[$functionKeyword]['code'], $declarations) === true) {
-                // This is just a declaration; no constants here.
-                return;
-            }
-
-            if ($tokens[$functionKeyword]['code'] === T_CONST) {
-                // This is a class constant.
-                if (strtoupper($constName) !== $constName) {
-                    $error = 'Class constants must be uppercase; expected %s but found %s';
-                    $data = array(
-                        strtoupper($constName),
-                        $constName,
-                    );
-                    $phpcsFile->addError($error, $stackPtr, 'ClassConstantNotUpperCase', $data);
-                }
-
-                return;
-            }
-
-            // Is this a class name?
-            $nextPtr = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-            if ($tokens[$nextPtr]['code'] === T_DOUBLE_COLON) {
-                return;
-            }
-
-            // Is this a namespace name?
-            if ($tokens[$nextPtr]['code'] === T_NS_SEPARATOR) {
-                return;
-            }
-
-            // Is this an insteadof name?
-            if ($tokens[$nextPtr]['code'] === T_INSTEADOF) {
-                return;
-            }
-
-            // Is this an as name?
-            if ($tokens[$nextPtr]['code'] === T_AS) {
-                return;
-            }
-
-            // Is this a type hint?
-            if ($tokens[$nextPtr]['code'] === T_VARIABLE
-                || $phpcsFile->isReference($nextPtr) === true
-            ) {
-                return;
-            }
-
-            // Is this a member var name?
-            $prevPtr = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-            if ($tokens[$prevPtr]['code'] === T_OBJECT_OPERATOR) {
-                return;
-            }
-
-            // Is this a variable name, in the form ${varname} ?
-            if ($tokens[$prevPtr]['code'] === T_OPEN_CURLY_BRACKET) {
-                $nextPtr = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-                if ($tokens[$nextPtr]['code'] === T_CLOSE_CURLY_BRACKET) {
-                    return;
-                }
-            }
-
-            // Is this a namespace name?
-            if ($tokens[$prevPtr]['code'] === T_NS_SEPARATOR) {
-                return;
-            }
-
-            // Is this an instance of declare()
-            $prevPtrDeclare = $phpcsFile->findPrevious(
-                array(T_WHITESPACE, T_OPEN_PARENTHESIS),
-                ($stackPtr - 1),
-                null,
-                true
-            );
-            if ($tokens[$prevPtrDeclare]['code'] === T_DECLARE) {
-                return;
-            }
-
-            // Is this a goto label target?
-            if ($tokens[$nextPtr]['code'] === T_COLON) {
-                if (in_array($tokens[$prevPtr]['code'], array(T_SEMICOLON, T_OPEN_CURLY_BRACKET, T_COLON), true)) {
-                    return;
-                }
-            }
-
-            // This is a real constant.
-            if (strtoupper($constName) !== $constName) {
-                $error = 'Constants must be uppercase; expected %s but found %s';
-                $data = array(
-                    strtoupper($constName),
-                    $constName,
-                );
-                $phpcsFile->addError($error, $stackPtr, 'ConstantNotUpperCase', $data);
-            }
-
-        } elseif (strtolower($constName) === 'define' || strtolower($constName) === 'constant') {
-            /*
-                This may be a "define" or "constant" function call.
-            */
-            // Make sure this is not a method call.
-            $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-            if ($tokens[$prev]['code'] === T_OBJECT_OPERATOR
-                || $tokens[$prev]['code'] === T_DOUBLE_COLON
-            ) {
-                return;
-            }
-
-            // The next non-whitespace token must be the constant name.
-            $constPtr = $phpcsFile->findNext(T_WHITESPACE, ($openBracket + 1), null, true);
-            if ($tokens[$constPtr]['code'] !== T_CONSTANT_ENCAPSED_STRING) {
-                return;
-            }
-
-            $constName = $tokens[$constPtr]['content'];
-
-            // Check for constants like self::CONSTANT.
-            $prefix = '';
-            $splitPos = strpos($constName, '::');
-            if ($splitPos !== false) {
-                $prefix = substr($constName, 0, ($splitPos + 2));
-                $constName = substr($constName, ($splitPos + 2));
-            }
-
-            if (strtoupper($constName) !== $constName) {
-                $error = 'Constants must be uppercase; expected %s but found %s';
-                $data = array(
-                    $prefix . strtoupper($constName),
-                    $prefix . $constName,
-                );
-                $phpcsFile->addError($error, $stackPtr, 'ConstantNotUpperCase', $data);
-            }
-        }
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidClassBracketsSniff.php b/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidClassBracketsSniff.php
deleted file mode 100644
index a43ac59d0..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidClassBracketsSniff.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Ensures curly brackets are on the same line as the Class declaration
- *
- */
-class FHComplete_Sniffs_NamingConventions_ValidClassBracketsSniff implements PHP_CodeSniffer_Sniff
-{
-/**
- * Returns an array of tokens this test wants to listen for.
- *
- * @return array
- */
-    public function register()
-    {
-        return array(T_CLASS);
-    }
-
-/**
- * Processes this test, when one of its tokens is encountered.
- *
- * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
- * @param integer $stackPtr  The position of the current token in the stack passed in $tokens.
- * @return void
- */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $found = $phpcsFile->findNext(T_OPEN_CURLY_BRACKET, $stackPtr);
-        if ($tokens[$found - 1]['code'] != T_WHITESPACE) {
-            $error = 'Expected 1 space after class declaration, found 0';
-            $phpcsFile->addError($error, $found - 1, 'InvalidSpacing', array());
-            return;
-        }
-
-        if (strlen($tokens[$found - 1]['content']) > 1 || $tokens[$found - 2]['code'] == T_WHITESPACE) {
-            $error = 'Expected 1 space after class declaration, found ' . strlen($tokens[$found - 1]['content']);
-            $phpcsFile->addError($error, $found - 1, 'InvalidSpacing', array());
-        }
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidClassNameSniff.php b/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidClassNameSniff.php
deleted file mode 100644
index 6bdd79cb4..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidClassNameSniff.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Squiz_Sniffs_Classes_ValidClassNameSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * Squiz_Sniffs_Classes_ValidClassNameSniff.
- *
- * Ensures classes are in camel caps, and the first letter is capitalised
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @version   Release: @package_version@
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-class FHComplete_Sniffs_NamingConventions_ValidClassNameSniff implements PHP_CodeSniffer_Sniff
-{
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-                T_CLASS,
-                T_INTERFACE,
-               );
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token in the
-     *                                        stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]['scope_opener']) === false) {
-            $error = 'Possible parse error: %s missing opening or closing brace';
-            $data  = array($tokens[$stackPtr]['content']);
-            $phpcsFile->addWarning($error, $stackPtr, 'MissingBrace', $data);
-            return;
-        }
-
-        // Determine the name of the class or interface. Note that we cannot
-        // simply look for the first T_STRING because a class name
-        // starting with the number will be multiple tokens.
-        $opener    = $tokens[$stackPtr]['scope_opener'];
-        $nameStart = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), $opener, true);
-        $nameEnd   = $phpcsFile->findNext(T_WHITESPACE, $nameStart, $opener);
-        if ($nameEnd === false) {
-            $name = $tokens[$nameStart]['content'];
-        } else {
-            $name = trim($phpcsFile->getTokensAsString($nameStart, ($nameEnd - $nameStart)));
-        }
-
-        // Check for camel caps format.
-        $valid = PHP_CodeSniffer::isCamelCaps($name, true, true, false);
-        if ($valid === false) {
-            $type  = ucfirst($tokens[$stackPtr]['content']);
-            $error = '%s name "%s" is not in camel caps format';
-            $data  = array(
-                      $type,
-                      $name,
-                     );
-            $phpcsFile->addWarning($error, $stackPtr, 'NotCamelCaps', $data);
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase class name', 'no');
-        } else {
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase class name', 'yes');
-        }
-
-    }//end process()
-
-
-}//end class
diff --git a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php
deleted file mode 100644
index 43bfd9b49..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Ensures method names are correct depending on whether they are public
- * or private, and that functions are named correctly.
- *
- */
-class FHComplete_Sniffs_NamingConventions_ValidFunctionNameSniff extends PHP_CodeSniffer_Standards_AbstractScopeSniff {
-
-/**
- * A list of all PHP magic methods.
- *
- * @var array
- */
-	protected $_magicMethods = array(
-		'construct',
-		'destruct',
-		'call',
-		'callStatic',
-		'debugInfo',
-		'get',
-		'set',
-		'isset',
-		'unset',
-		'sleep',
-		'wakeup',
-		'toString',
-		'set_state',
-		'clone',
-		'invoke',
-	);
-
-/**
- * Constructs a PEAR_Sniffs_NamingConventions_ValidFunctionNameSniff.
- */
-	public function __construct() {
-		parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
-	}
-
-/**
- * Processes the tokens within the scope.
- *
- * @param PHP_CodeSniffer_File $phpcsFile The file being processed.
- * @param integer $stackPtr The position where this token was found.
- * @param integer $currScope The position of the current scope.
- * @return void
- */
-	protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $currScope) {
-		$methodName = $phpcsFile->getDeclarationName($stackPtr);
-		if ($methodName === null) {
-			// Ignore closures.
-			return;
-		}
-
-		$className = $phpcsFile->getDeclarationName($currScope);
-		$errorData = array($className . '::' . $methodName);
-
-		// PHP4 constructors are allowed to break our rules.
-		if ($methodName === $className) {
-			return;
-		}
-
-		// PHP4 destructors are allowed to break our rules.
-		if ($methodName === '_' . $className) {
-			return;
-		}
-
-		// Ignore magic methods
-		if (preg_match('/^__(' . implode('|', $this->_magicMethods) . ')$/', $methodName)) {
-			return;
-		}
-
-		$methodProps = $phpcsFile->getMethodProperties($stackPtr);
-		if ($methodProps['scope_specified'] === false) {
-			// Let another sniffer take care of that
-			return;
-		}
-
-		$isPublic = $methodProps['scope'] === 'public';
-		$isProtected = $methodProps['scope'] === 'protected';
-		$isPrivate = $methodProps['scope'] === 'private';
-		$scope = $methodProps['scope'];
-
-		if ($isPublic === true) {
-			if ($methodName[0] === '_') {
-				$error = 'Public method name "%s" must not be prefixed with underscore';
-				$phpcsFile->addError($error, $stackPtr, 'PublicWithUnderscore', $errorData);
-				return;
-			}
-			// Underscored public methods in controller are allowed to break our rules.
-			if (substr($className, -10) === 'Controller') {
-				return;
-			}
-			// Underscored public methods in shells are allowed to break our rules.
-			if (substr($className, -5) === 'Shell') {
-				return;
-			}
-			// Underscored public methods in tasks are allowed to break our rules.
-			if (substr($className, -4) === 'Task') {
-				return;
-			}
-		}
-	}
-
-/**
- * Processes the tokens outside the scope.
- *
- * @param PHP_CodeSniffer_File $phpcsFile The file being processed.
- * @param integer $stackPtr  The position where this token was found.
- * @return void
- */
-	protected function processTokenOutsideScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
-	}
-
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidTraitNameSniff.php b/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidTraitNameSniff.php
deleted file mode 100644
index 5364eab07..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidTraitNameSniff.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Ensures trait names are correct depending on the folder of the file.
- *
- */
-class FHComplete_Sniffs_NamingConventions_ValidTraitNameSniff implements PHP_CodeSniffer_Sniff
-{
-
-/**
- * Returns an array of tokens this test wants to listen for.
- *
- * If the constant is not defined, ignore because probably the PHP version
- * is under 5.4.0 and don't have traits in use
- *
- * @return array
- */
-    public function register()
-    {
-        if (!defined('T_TRAIT')) {
-            return array();
-        }
-        return array(T_TRAIT);
-    }
-
-/**
- * Processes this test, when one of its tokens is encountered.
- *
- * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
- * @param integer $stackPtr  The position of the current token in the stack passed in $tokens.
- * @return void
- */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $traitName = $tokens[$stackPtr + 2]['content'];
-
-        if (substr($traitName, -5) !== 'Trait') {
-            $error = 'Traits must have a "Trait" suffix.';
-            $phpcsFile->addError($error, $stackPtr, 'InvalidTraitName', array());
-        }
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/PHP/DisallowShortOpenTagSniff.php b/tests/codesniffer/FHComplete/Sniffs/PHP/DisallowShortOpenTagSniff.php
deleted file mode 100644
index cd3b8598e..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/PHP/DisallowShortOpenTagSniff.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Disallow short open tags
- *
- * But permit short-open echo tags (<?=) [T_OPEN_TAG_WITH_ECHO] as they are part of PHP 5.4+
- *
- */
-class FHComplete_Sniffs_PHP_DisallowShortOpenTagSniff implements PHP_CodeSniffer_Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * If short open tags are NOT enabled, <? is not considered a T_OPEN_TAG
-     * So include T_INLINE_HTML which is what "<?" is detected as
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_OPEN_TAG,
-            T_INLINE_HTML
-        );
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param integer              $stackPtr  The position of the current token in the
-     *                             stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $openTag = $tokens[$stackPtr];
-
-        if (trim($openTag['content']) === '<?') {
-            $error = 'Short PHP opening tag used; expected "<?php" but found "%s"';
-            $data = array(trim($openTag['content']));
-            $phpcsFile->addError($error, $stackPtr, 'Found', $data);
-        }
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/PHP/TypeCastingSniff.php b/tests/codesniffer/FHComplete/Sniffs/PHP/TypeCastingSniff.php
deleted file mode 100644
index 2595c4f56..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/PHP/TypeCastingSniff.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * FHComplete
- */
-
-/**
- * Asserts that type casts are in the short form:
- * - bool instead of boolean
- * - int instead of integer
- */
-class FHComplete_Sniffs_PHP_TypeCastingSniff implements PHP_CodeSniffer_Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * Note, that this sniff only checks the value and casing of a cast.
-     * It does not check for whitespace issues regarding casts, as
-     * - Squiz.WhiteSpace.CastSpacing.ContainsWhiteSpace checks for whitespace in the cast
-     * - Generic.Formatting.NoSpaceAfterCast.SpaceFound checks for whitespace after the cast
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array_merge(PHP_CodeSniffer_Tokens::$castTokens, array(T_BOOLEAN_NOT));
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param integer              $stackPtr  The position of the current token in the
-     *                                        stack passed in $tokens.
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Process !! casts
-        if ($tokens[$stackPtr]['code'] == T_BOOLEAN_NOT) {
-            $nextToken = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-            if (!$nextToken) {
-                return;
-            }
-            if ($tokens[$nextToken]['code'] != T_BOOLEAN_NOT) {
-                return;
-            }
-            $error = 'Usage of !! cast is not allowed. Please use (bool) to cast.';
-            $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
-
-            return;
-        }
-
-        // Only allow short forms if both short and long forms are possible
-        $matching = array(
-            '(boolean)' => '(bool)',
-            '(integer)' => '(int)',
-        );
-        $content = $tokens[$stackPtr]['content'];
-        $key = strtolower($content);
-        if (isset($matching[$key])) {
-            $error = 'Please use ' . $matching[$key] . ' instead of ' . $content . '.';
-            $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
-            return;
-        }
-        if ($content !== $key) {
-            $error = 'Please use ' . $key . ' instead of ' . $content . '.';
-            $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
-            return;
-        }
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/Strings/ConcatenationSpacingSniff.php b/tests/codesniffer/FHComplete/Sniffs/Strings/ConcatenationSpacingSniff.php
deleted file mode 100644
index 59eaaf974..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/Strings/ConcatenationSpacingSniff.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Makes sure there are spaces between the concatenation operator (.) and
- * the strings being concatenated.
- *
- */
-class FHComplete_Sniffs_Strings_ConcatenationSpacingSniff implements PHP_CodeSniffer_Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_STRING_CONCAT);
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param integer $stackPtr The position of the current token in the
-     *    stack passed in $tokens.
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        if ($tokens[($stackPtr - 1)]['code'] == T_WHITESPACE) {
-            $message = 'Expected 0 spaces before ., but 1 found';
-            $phpcsFile->addError($message, $stackPtr, 'FoundBefore');
-        }
-
-        if ($tokens[($stackPtr + 1)]['code'] == ' ') 
-		{
-            $message = 'Expected 0 spaces after ., but 1 found';
-            $phpcsFile->addError($message, $stackPtr, 'FoundAfter');
-        } 
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/CommaSpacingSniff.php b/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/CommaSpacingSniff.php
deleted file mode 100644
index 7506abe9f..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/CommaSpacingSniff.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Ensures no whitespaces and one whitespace is placed around each comma
- *
- */
-class FHComplete_Sniffs_WhiteSpace_CommaSpacingSniff implements PHP_CodeSniffer_Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_COMMA);
-    }
-
-/**
- * Processes this test, when one of its tokens is encountered.
- *
- * @param PHP_CodeSniffer_File $phpcsFile All the tokens found in the document.
- * @param integer $stackPtr The position of the current token
- *    in the stack passed in $tokens.
- * @return void
- */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-
-        if ($tokens[$next]['code'] !== T_WHITESPACE && ($next !== $stackPtr + 2)) {
-            // Last character in a line is ok.
-            if ($tokens[$next]['line'] === $tokens[$stackPtr]['line']) {
-                $error = 'Missing space after comma';
-                $phpcsFile->addError($error, $next);
-            }
-        }
-
-        $previous = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-
-        if ($tokens[$previous]['code'] !== T_WHITESPACE && ($previous !== $stackPtr - 1)) {
-            $error = 'Space before comma, expected none, though';
-            $phpcsFile->addError($error, $next);
-        }
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php b/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php
deleted file mode 100644
index 8a3cbc8e0..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Checks the separation between methods in a class or interface.
- *
- */
-class FHComplete_Sniffs_WhiteSpace_FunctionCallSpacingSniff implements PHP_CodeSniffer_Sniff
-{
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_ISSET,
-            T_EMPTY,
-            T_STRING,
-        );
-    }
-
-    /**
-     * Processes this sniff, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param integer $stackPtr The position of the current token in the stack passed in $tokens.
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Find the next non-empty token.
-        $openBracket = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-
-        if ($tokens[$openBracket]['code'] !== T_OPEN_PARENTHESIS) {
-            // Not a function call.
-            return;
-        }
-
-        // Look for funcName (
-        if (($stackPtr + 1) !== $openBracket) {
-            $error = 'Space before opening parenthesis of function call not allowed';
-            $phpcsFile->addError($error, $stackPtr, 'SpaceBeforeOpenBracket');
-        }
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php b/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
deleted file mode 100644
index 83e7ac73e..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Checks that there is one empty line before the closing brace of a function.
- *
- */
-class FHComplete_Sniffs_WhiteSpace_FunctionClosingBraceSpaceSniff implements PHP_CodeSniffer_Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_FUNCTION);
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param integer $stackPtr  The position of the current token
-     *    in the stack passed in $tokens.
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]['scope_closer']) === false) {
-            // Probably an interface method.
-            return;
-        }
-
-        $closeBrace = $tokens[$stackPtr]['scope_closer'];
-        $prevContent = $phpcsFile->findPrevious(T_WHITESPACE, ($closeBrace - 1), null, true);
-
-        $braceLine = $tokens[$closeBrace]['line'];
-        $prevLine = $tokens[$prevContent]['line'];
-
-        $found = ($braceLine - $prevLine - 1);
-        if ($phpcsFile->hasCondition($stackPtr, T_FUNCTION) === true
-         || isset($tokens[$stackPtr]['nested_parenthesis']) === true
-        ) {
-            // Nested function.
-            if ($found < 0) {
-                $error = 'Closing brace of nested function must be on a new line';
-                $phpcsFile->addError($error, $closeBrace, 'ContentBeforeClose');
-            } elseif ($found > 0) {
-                $error = 'Expected 0 blank lines before closing brace of nested function; %s found';
-                $data = array($found);
-                $phpcsFile->addError($error, $closeBrace, 'SpacingBeforeNestedClose', $data);
-            }
-        } else {
-            if ($found !== 0) {
-                $error = 'Expected 0 blank lines before closing function brace; %s found';
-                $data = array($found);
-                $phpcsFile->addError($error, $closeBrace, 'SpacingBeforeClose', $data);
-            }
-        }
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php b/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
deleted file mode 100644
index d202e760a..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Checks that there is no empty line after the opening brace of a function.
- *
- */
-class FHComplete_Sniffs_WhiteSpace_FunctionOpeningBraceSpaceSniff implements PHP_CodeSniffer_Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_FUNCTION);
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param integer $stackPtr  The position of the current token
-     *   in the stack passed in $tokens.
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]['scope_opener']) === false) {
-            // Probably an interface method.
-            return;
-        }
-
-        $openBrace = $tokens[$stackPtr]['scope_opener'];
-        $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($openBrace + 1), null, true);
-
-        if ($nextContent === $tokens[$stackPtr]['scope_closer']) {
-            // The next bit of content is the closing brace, so this
-            // is an empty function and should have a blank line
-            // between the opening and closing braces.
-            return;
-        }
-
-        $braceLine = $tokens[$openBrace]['line'];
-        $nextLine = $tokens[$nextContent]['line'];
-
-        $found = ($nextLine - $braceLine - 1);
-        if ($found > 0) {
-            $error = 'Expected 0 blank lines after opening function brace; %s found';
-            $data = array($found);
-            $phpcsFile->addError($error, $openBrace, 'SpacingAfter', $data);
-        }
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionSpacingSniff.php b/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionSpacingSniff.php
deleted file mode 100644
index 09f6a55b0..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionSpacingSniff.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Checks the separation between methods in a class or interface.
- *
- */
-class FHComplete_Sniffs_WhiteSpace_FunctionSpacingSniff implements PHP_CodeSniffer_Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_FUNCTION);
-    }
-
-    /**
-     * Processes this sniff, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param integer $stackPtr The position of the current token in the stack passed in $tokens.
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        /*
-            Check the number of blank lines
-            after the function.
-        */
-
-        if (isset($tokens[$stackPtr]['scope_closer']) === false) {
-            // Must be an interface method, so the closer is the semi-colon.
-            $closer = $phpcsFile->findNext(T_SEMICOLON, $stackPtr);
-        } else {
-            $closer = $tokens[$stackPtr]['scope_closer'];
-        }
-
-        // There needs to be 1 blank lines after the closer.
-        $nextLineToken = null;
-        for ($i = $closer; $i < $phpcsFile->numTokens; $i++) {
-            if (strpos($tokens[$i]['content'], $phpcsFile->eolChar) === false) {
-                continue;
-            } else {
-                $nextLineToken = ($i + 1);
-                break;
-            }
-        }
-
-        if ($nextLineToken === null) {
-            // Never found the next line, which means
-            // there are 0 blank lines after the function.
-            $foundLines = 0;
-        } else {
-            $nextContent = $phpcsFile->findNext(array(T_WHITESPACE), ($nextLineToken + 1), null, true);
-            if ($nextContent === false) {
-                // We are at the end of the file. That is acceptable as well.
-                $foundLines = 1;
-            } else {
-                $foundLines = ($tokens[$nextContent]['line'] - $tokens[$nextLineToken]['line']);
-            }
-        }
-
-        /*
-            Check the number of blank lines
-            before the function.
-        */
-
-        $prevLineToken = null;
-        for ($i = $stackPtr; $i > 0; $i--) {
-            if (strpos($tokens[$i]['content'], $phpcsFile->eolChar) === false) {
-                continue;
-            } else {
-                $prevLineToken = $i;
-                break;
-            }
-        }
-
-        if ($prevLineToken === null) {
-            // Never found the previous line, which means
-            // there are 0 blank lines before the function.
-            $foundLines = 0;
-        } else {
-            $prevContent = $phpcsFile->findPrevious(array(T_WHITESPACE, T_DOC_COMMENT), $prevLineToken, null, true);
-
-            // Before we throw an error, check that we are not throwing an error
-            // for another function. We don't want to error for no blank lines after
-            // the previous function and no blank lines before this one as well.
-            $currentLine = $tokens[$stackPtr]['line'];
-            $prevLine = ($tokens[$prevContent]['line'] - 1);
-            $i = ($stackPtr - 1);
-            $foundLines = 0;
-            while ($currentLine !== $prevLine && $currentLine > 1 && $i > 0) {
-                if (isset($tokens[$i]['scope_condition']) === true) {
-                    $scopeCondition = $tokens[$i]['scope_condition'];
-                    if ($tokens[$scopeCondition]['code'] === T_FUNCTION) {
-                        // Found a previous function.
-                        return;
-                    }
-                } elseif ($tokens[$i]['code'] === T_FUNCTION) {
-                    // Found another interface function.
-                    return;
-                }
-
-                $currentLine = $tokens[$i]['line'];
-                if ($currentLine === $prevLine) {
-                    break;
-                }
-
-                if ($tokens[($i - 1)]['line'] < $currentLine && $tokens[($i + 1)]['line'] > $currentLine) {
-                    // This token is on a line by itself. If it is whitespace, the line is empty.
-                    if ($tokens[$i]['code'] === T_WHITESPACE) {
-                        $foundLines++;
-                    }
-                }
-                $i--;
-            }
-        }
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
deleted file mode 100644
index a52680736..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Ensure there is no whitespace before a semicolon.
- *
- */
-class FHComplete_Sniffs_WhiteSpace_ObjectOperatorSpacingSniff implements PHP_CodeSniffer_Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_OBJECT_OPERATOR);
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param integer $stackPtr The position of the current token in the stack passed in $tokens.
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $nextType = $tokens[($stackPtr + 1)]['code'];
-        if (in_array($nextType, PHP_CodeSniffer_Tokens::$emptyTokens) === true) {
-            $error = 'Space found after object operator';
-            $phpcsFile->addError($error, $stackPtr, 'After');
-        }
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/OperatorSpacingSniff.php
deleted file mode 100644
index efeef023a..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/OperatorSpacingSniff.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Verifies that operators have valid spacing surrounding them.
- *
- */
-class FHComplete_Sniffs_WhiteSpace_OperatorSpacingSniff implements PHP_CodeSniffer_Sniff
-{
-
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-        'PHP',
-        'JS',
-    );
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        $comparison = PHP_CodeSniffer_Tokens::$comparisonTokens;
-        $operators = PHP_CodeSniffer_Tokens::$operators;
-        $assignment = PHP_CodeSniffer_Tokens::$assignmentTokens;
-
-        return array_unique(array_merge($comparison, $operators, $assignment));
-    }
-
-    /**
-     * Processes this sniff, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The current file being checked.
-     * @param integer $stackPtr  The position of the current token in the
-     *    stack passed in $tokens.
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Skip default values in function declarations.
-        if ($tokens[$stackPtr]['code'] === T_EQUAL
-            || $tokens[$stackPtr]['code'] === T_MINUS
-        ) {
-            if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
-                $parenthesis = array_keys($tokens[$stackPtr]['nested_parenthesis']);
-                $bracket = array_pop($parenthesis);
-                if (isset($tokens[$bracket]['parenthesis_owner']) === true) {
-                    $function = $tokens[$bracket]['parenthesis_owner'];
-                    if ($tokens[$function]['code'] === T_FUNCTION) {
-                        return;
-                    }
-                }
-            }
-        }
-
-        if ($tokens[$stackPtr]['code'] === T_EQUAL) {
-            // Skip for '=&' case.
-            if (isset($tokens[($stackPtr + 1)]) === true && $tokens[($stackPtr + 1)]['code'] === T_BITWISE_AND) {
-                return;
-            }
-        }
-
-        if ($tokens[$stackPtr]['code'] === T_BITWISE_AND) {
-            // If its not a reference, then we expect one space either side of the
-            // bitwise operator.
-            if (!$phpcsFile->isReference($stackPtr) && !$this->isVariable($stackPtr, $tokens, $phpcsFile)) {
-                // Check there is one space before the & operator.
-                if ($tokens[($stackPtr - 1)]['code'] !== T_WHITESPACE) {
-                    $error = 'Expected 1 space before "&" operator; 0 found';
-                    $phpcsFile->addError($error, $stackPtr, 'NoSpaceBeforeAmp');
-                }
-
-                // Check there is one space after the & operator.
-                if ($tokens[($stackPtr + 1)]['code'] !== T_WHITESPACE) {
-                    $error = 'Expected 1 space after "&" operator; 0 found';
-                    $phpcsFile->addError($error, $stackPtr, 'NoSpaceAfterAmp');
-                }
-            }
-        } else {
-            if ($tokens[$stackPtr]['code'] === T_MINUS) {
-                // Skip declaration of negative value in new array format; eg. $arr = [-1].
-                if ($tokens[($stackPtr - 1)]['code'] === T_OPEN_SHORT_ARRAY) {
-                    return;
-                }
-
-                // Check minus spacing, but make sure we aren't just assigning
-                // a minus value or returning one.
-                $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-                if ($tokens[$prev]['code'] === T_RETURN) {
-                    // Just returning a negative value; eg. return -1.
-                    return;
-                }
-
-                if (in_array($tokens[$prev]['code'], PHP_CodeSniffer_Tokens::$operators) === true) {
-                    // Just trying to operate on a negative value; eg. ($var * -1).
-                    return;
-                }
-
-                if (in_array($tokens[$prev]['code'], PHP_CodeSniffer_Tokens::$comparisonTokens) === true) {
-                    // Just trying to compare a negative value; eg. ($var === -1).
-                    return;
-                }
-
-                // A list of tokens that indicate that the token is not
-                // part of an arithmetic operation.
-                $invalidTokens = array(
-                    T_COMMA,
-                    T_OPEN_PARENTHESIS,
-                    T_OPEN_SQUARE_BRACKET,
-                    T_DOUBLE_ARROW,
-                    T_COLON,
-                    T_INLINE_THEN,
-                    T_INLINE_ELSE,
-                    T_CASE,
-                );
-
-                if (in_array($tokens[$prev]['code'], $invalidTokens) === true) {
-                    // Just trying to use a negative value; eg. myFunction($var, -2).
-                    return;
-                }
-                if (in_array($tokens[$prev]['code'], PHP_CodeSniffer_Tokens::$assignmentTokens) === true) {
-                    // Just trying to assign a negative value; eg. ($var = -1).
-                    return;
-                }
-            }
-
-            $operator = $tokens[$stackPtr]['content'];
-
-            if ($tokens[($stackPtr - 1)]['code'] !== T_WHITESPACE) {
-                $error = "Expected 1 space before \"$operator\"; 0 found";
-                $phpcsFile->addError($error, $stackPtr, 'NoSpaceBefore');
-            }
-
-            if ($tokens[($stackPtr + 1)]['code'] !== T_WHITESPACE) {
-                $error = "Expected 1 space after \"$operator\"; 0 found";
-                $phpcsFile->addError($error, $stackPtr, 'NoSpaceAfter');
-            }
-        }
-    }
-
-    /**
-     * Check if the current token is inside an array.
-     *
-     * @param int $stackPtr The current token offset.
-     * @param array $phpcsFile The current token list.
-     * @return bool
-     */
-    protected function isVariable($stackPtr, $tokens, $phpcsFile)
-    {
-        $tokenAfter = $phpcsFile->findNext(
-            PHP_CodeSniffer_Tokens::$emptyTokens,
-            ($stackPtr + 1),
-            null,
-            true
-        );
-        $tokenBefore = $phpcsFile->findNext(
-            PHP_CodeSniffer_Tokens::$emptyTokens,
-            ($stackPtr - 1),
-            null,
-            true
-        );
-
-        if ($tokens[$tokenAfter]['code'] === T_VARIABLE &&
-            (
-                $tokens[$tokenBefore]['code'] === T_OPEN_PARENTHESIS ||
-                $tokens[$tokenBefore]['code'] === T_COMMA ||
-                $tokens[$tokenBefore]['code'] === T_OPEN_SHORT_ARRAY
-            )
-        ) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ScopeIndentSniff.php b/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ScopeIndentSniff.php
deleted file mode 100644
index b3e998ed4..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ScopeIndentSniff.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Checks that control structures are structured correctly, and their content
- * is indented correctly. This sniff will throw errors if tabs are used
- * for indentation rather than spaces.
- *
- */
-class FHComplete_Sniffs_WhiteSpace_ScopeIndentSniff implements PHP_CodeSniffer_Sniff
-{
-
-    /**
-     * The number of spaces code should be indented.
-     *
-     * @var int
-     */
-    public $indent = 1;
-
-    /**
-     * Does the indent need to be exactly right.
-     *
-     * If TRUE, indent needs to be exactly $ident spaces. If FALSE,
-     * indent needs to be at least $ident spaces (but can be more).
-     *
-     * @var bool
-     */
-    public $exact = false;
-
-    /**
-     * Any scope openers that should not cause an indent.
-     *
-     * @var array(int)
-     */
-    protected $nonIndentingScopes = array();
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return PHP_CodeSniffer_Tokens::$scopeOpeners;
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile All the tokens found in the document.
-     * @param int $stackPtr The position of the current token
-     *    in the stack passed in $tokens.
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // If this is an inline condition (ie. there is no scope opener), then
-        // return, as this is not a new scope.
-        if (isset($tokens[$stackPtr]['scope_opener']) === false) {
-            return;
-        }
-
-        if ($tokens[$stackPtr]['code'] === T_ELSE) {
-            $next = $phpcsFile->findNext(
-                PHP_CodeSniffer_Tokens::$emptyTokens,
-                ($stackPtr + 1),
-                null,
-                true
-            );
-
-            // We will handle the T_IF token in another call to process.
-            if ($tokens[$next]['code'] === T_IF) {
-                return;
-            }
-        }
-
-        // Find the first token on this line.
-        $firstToken = $stackPtr;
-        for ($i = $stackPtr; $i >= 0; $i--) {
-            // Record the first code token on the line.
-            if (in_array($tokens[$i]['code'], PHP_CodeSniffer_Tokens::$emptyTokens) === false) {
-                $firstToken = $i;
-            }
-
-            // It's the start of the line, so we've found our first php token.
-            if ($tokens[$i]['column'] === 1) {
-                break;
-            }
-        }
-
-        // Based on the conditions that surround this token, determine the
-        // indent that we expect this current content to be.
-        $expectedIndent = $this->calculateExpectedIndent($tokens, $firstToken);
-
-        $scopeOpener = $tokens[$stackPtr]['scope_opener'];
-        $scopeCloser = $tokens[$stackPtr]['scope_closer'];
-
-        // Some scopes are expected not to have indents.
-        if (in_array($tokens[$firstToken]['code'], $this->nonIndentingScopes) === false) {
-            $indent = ($expectedIndent + $this->indent);
-        } else {
-            $indent = $expectedIndent;
-        }
-
-        $newline = false;
-        $commentOpen = false;
-        $inHereDoc = false;
-
-        // Only loop over the content beween the opening and closing brace, not
-        // the braces themselves.
-        for ($i = ($scopeOpener + 1); $i < $scopeCloser; $i++) {
-            // If this token is another scope, skip it as it will be handled by
-            // another call to this sniff.
-            if (in_array($tokens[$i]['code'], PHP_CodeSniffer_Tokens::$scopeOpeners) === true) {
-                if (isset($tokens[$i]['scope_opener']) === true) {
-                    $i = $tokens[$i]['scope_closer'];
-
-                    // If the scope closer is followed by a semi-colon, the semi-colon is part
-                    // of the closer and should also be ignored. This most commonly happens with
-                    // CASE statements that end with "break;", where we don't want to stop
-                    // ignoring at the break, but rather at the semi-colon.
-                    $nextToken = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($i + 1), null, true);
-                    if ($tokens[$nextToken]['code'] === T_SEMICOLON) {
-                        $i = $nextToken;
-                    }
-                } else {
-                    // If this token does not have a scope_opener indice, then
-                    // it's probably an inline scope, so let's skip to the next
-                    // semicolon. Inline scopes include inline if's, abstract
-                    // methods etc.
-                    $nextToken = $phpcsFile->findNext(T_SEMICOLON, $i, $scopeCloser);
-                    if ($nextToken !== false) {
-                        $i = $nextToken;
-                    }
-                }
-                continue;
-            }
-
-            // If this is a HEREDOC then we need to ignore it as the
-            // whitespace before the contents within the HEREDOC are
-            // considered part of the content.
-            if ($tokens[$i]['code'] === T_START_HEREDOC) {
-                $inHereDoc = true;
-                continue;
-            } elseif ($inHereDoc === true) {
-                if ($tokens[$i]['code'] === T_END_HEREDOC) {
-                    $inHereDoc = false;
-                }
-                continue;
-            }
-
-            if ($tokens[$i]['column'] === 1) {
-                // We started a newline.
-                $newline = true;
-            }
-
-            if ($newline === true && $tokens[$i]['code'] !== T_WHITESPACE) {
-                // If we started a newline and we find a token that is not
-                // whitespace, then this must be the first token on the line that
-                // must be indented.
-                $newline = false;
-                $firstToken = $i;
-
-                $column = $tokens[$firstToken]['column'];
-
-                // Special case for non-PHP code.
-                if ($tokens[$firstToken]['code'] === T_INLINE_HTML) {
-                    $trimmedContentLength = strlen(ltrim($tokens[$firstToken]['content']));
-                    if ($trimmedContentLength === 0) {
-                        continue;
-                    }
-
-                    $contentLength = strlen($tokens[$firstToken]['content']);
-                    $column = ($contentLength - $trimmedContentLength + 1);
-                }
-
-                // If we're starting a new PHP block that has the scope closer
-                // as the next token we'll skip the remaining checks as the scope is closed.
-                if ($tokens[$firstToken]['code'] === T_OPEN_TAG &&
-                    $scopeCloser == $firstToken + 1
-                ) {
-                    continue;
-                }
-
-                // Check to see if this constant string spans multiple lines.
-                // If so, then make sure that the strings on lines other than the
-                // first line are indented appropriately, based on their whitespace.
-                if (in_array($tokens[$firstToken]['code'], PHP_CodeSniffer_Tokens::$stringTokens) === true) {
-                    if (in_array($tokens[($firstToken - 1)]['code'], PHP_CodeSniffer_Tokens::$stringTokens) === true) {
-                        // If we find a string that directly follows another string
-                        // then its just a string that spans multiple lines, so we
-                        // don't need to check for indenting.
-                        continue;
-                    }
-                }
-
-                // This is a special condition for T_DOC_COMMENT and C-style
-                // comments, which contain whitespace between each line.
-                $comments = array(
-                    T_COMMENT,
-                    T_DOC_COMMENT
-                );
-
-                $isDocComment = false;
-                if (in_array($tokens[$firstToken]['code'], $comments) === true) {
-                    $content = trim($tokens[$firstToken]['content']);
-                    if (preg_match('|^/\*|', $content) !== 0) {
-                        // Check to see if the end of the comment is on the same line
-                        // as the start of the comment. If it is, then we don't
-                        // have to worry about opening a comment.
-                        if (preg_match('|\*/$|', $content) === 0) {
-                            // We don't have to calculate the column for the
-                            // start of the comment as there is a whitespace
-                            // token before it.
-                            $commentOpen = true;
-                            $isDocComment = (substr($content, 0, 3) === '/**');
-                        }
-                    } elseif ($commentOpen === true) {
-                        if ($content === '') {
-                            // We are in a comment, but this line has nothing on it
-                            // so let's skip it.
-                            continue;
-                        }
-
-                        $contentLength = strlen($tokens[$firstToken]['content']);
-                        $trimmedContentLength = strlen(ltrim($tokens[$firstToken]['content']));
-
-                        $column = ($contentLength - $trimmedContentLength + 1);
-                        if (preg_match('|\*/$|', $content) !== 0) {
-                            $commentOpen = false;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Calculates the expected indent of a token.
-     *
-     * @param array $tokens The stack of tokens for this file.
-     * @param int $stackPtr The position of the token to get indent for.
-     * @return int
-     */
-    protected function calculateExpectedIndent(array $tokens, $stackPtr)
-    {
-        $conditionStack = array();
-
-        // Empty conditions array (top level structure).
-        if (empty($tokens[$stackPtr]['conditions']) === true) {
-            if (isset($tokens[$stackPtr]['nested_parenthesis']) === true
-                && empty($tokens[$stackPtr]['nested_parenthesis']) === false
-            ) {
-                // Wrapped in parenthesis means it is probably in a
-                // function call (like a closure) so we have to assume indent
-                // is correct here and someone else will check it more
-                // carefully in another sniff.
-                return $tokens[$stackPtr]['column'];
-            } else {
-                return 1;
-            }
-        }
-
-        $tokenConditions = $tokens[$stackPtr]['conditions'];
-        foreach ($tokenConditions as $id => $condition) {
-            // If it's an indenting scope ie. it's not in our array of
-            // scopes that don't indent, add it to our condition stack.
-            if (in_array($condition, $this->nonIndentingScopes) === false) {
-                $conditionStack[$id] = $condition;
-            }
-        }
-        return ((count($conditionStack) * $this->indent) + 1);
-    }
-}
diff --git a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/TabAndSpaceSniff.php b/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/TabAndSpaceSniff.php
deleted file mode 100644
index 0c2593aa1..000000000
--- a/tests/codesniffer/FHComplete/Sniffs/WhiteSpace/TabAndSpaceSniff.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * PHP Version 5
- *
- * FHComplete
- */
-
-/**
- * Check for any line starting with 2 spaces - which would indicate space indenting
- * Also check for "\t " - a tab followed by a space, which is a common similar mistake
- *
- */
-class FHComplete_Sniffs_WhiteSpace_TabAndSpaceSniff implements PHP_CodeSniffer_Sniff
-{
-
-/**
- * A list of tokenizers this sniff supports.
- *
- * @var array
- */
-    public $supportedTokenizers = array(
-        'PHP',
-        'JS',
-        'CSS'
-    );
-
-/**
- * Returns an array of tokens this test wants to listen for.
- *
- * @return array
- */
-    public function register()
-    {
-        return array(T_WHITESPACE);
-    }
-
-/**
- * Processes this test, when one of its tokens is encountered.
- *
- * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
- * @param int $stackPtr  The position of the current token
- *    in the stack passed in $tokens.
- * @return void
- */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $line = $tokens[$stackPtr]['line'];
-        if ($stackPtr > 0 && $tokens[($stackPtr - 1)]['line'] !== $line) {
-            return;
-        }
-
-        if (strpos($tokens[$stackPtr]['content'], " \t") !== false) {
-            $error = 'Space and tab found';
-            $phpcsFile->addError($error, $stackPtr);
-        }
-        if (strpos($tokens[$stackPtr]['content'], "\t ") !== false) {
-            $error = 'Tab and space found';
-            $phpcsFile->addError($error, $stackPtr);
-        }
-    }
-}
diff --git a/tests/codesniffer/FHComplete/ruleset.xml b/tests/codesniffer/FHComplete/ruleset.xml
index 547a0a602..5817f4d34 100644
--- a/tests/codesniffer/FHComplete/ruleset.xml
+++ b/tests/codesniffer/FHComplete/ruleset.xml
@@ -2,64 +2,92 @@
 <ruleset name="FHComplete">
 	<description>FHComplete's coding standard</description>
 
-	<!-- Ignored directories if phpcs is running from command line, already ignored by phpci -->
+	<!-- Ignored directories -->
 	<exclude-pattern>\.git</exclude-pattern>
 	<exclude-pattern>vendor</exclude-pattern>
 	<exclude-pattern>tests</exclude-pattern>
+	<exclude-pattern>application/controllers/api/v1</exclude-pattern>
+	<exclude-pattern>application/extensions</exclude-pattern>
+	<exclude-pattern>addons</exclude-pattern>
 
+	<!-- This ruleset is based mainly on the PSR2 standard ruleset, exluding the following rules: -->
 	<rule ref="PSR2">
+		<!-- Forces the use of namespaces -->
 		<exclude name="PSR1.Classes.ClassDeclaration" />
-		<exclude name="PSR1.Methods.CamelCapsMethodName" />
-		<exclude name="PSR1.Files.SideEffects" />
-		<exclude name="Generic.WhiteSpace.DisallowTabIndent" />
-		<exclude name="Squiz.ControlStructures.ControlSignature" />
+		<!-- Forbids the use of underscores at the beginning of properties name -->
+		<exclude name="PSR2.Classes.PropertyDeclaration" />
+		<!-- Forbids the use of classes name that contain underscores -->
 		<exclude name="Squiz.Classes.ValidClassName" />
+		<!-- Forbids the use inline control structure (ex. an if statement on one line) -->
 		<exclude name="Generic.ControlStructures.InlineControlStructure" />
-		<exclude name="Squiz.PHP.DisallowSizeFunctionsInLoops" />
+		<!-- Forces to have the bracket on the same line of the statement -->
+		<exclude name="Squiz.ControlStructures.ControlSignature" />
+		<!-- Forces to have in a single file only a class declaration, an if statement outside the class is forbidden -->
+		<exclude name="PSR1.Files.SideEffects" />
+		<!-- Forbids to have an empty line at the end of the file -->
+		<exclude name="PSR2.Files.EndFileNewline" />
+		<!-- Forbids the use of underscores at the beginning of methods name -->
+		<exclude name="PSR2.Methods.MethodDeclaration" />
+		<!-- Forbids the use of tabs -->
+		<exclude name="Generic.WhiteSpace.DisallowTabIndent" />
 	</rule>
 
+	<!-- Do not prompt any warning about the line length -->
+	<!-- Prompt an error if the line length is more than 150 -->
 	<rule ref="Generic.Files.LineLength">
 		<properties>
-			<property name="lineLimit" value="120"/>
+			<property name="lineLimit" value="9999"/>
 			<property name="absoluteLineLimit" value="150"/>
 		</properties>
+		<exclude-pattern>application/phrases/</exclude-pattern>
 	</rule>
 
+	<!-- No white spaces are allowed in array declaration between brackets -->
 	<rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
 
+	<!-- Ensures all class keywords are lowercase -->
 	<rule ref="Squiz.Classes.LowercaseClassKeywords"/>
 
-	<rule ref="Generic.CodeAnalysis.JumbledIncrementer"/>
-	<rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop"/>
-	<rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
-	<rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
-	<rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall"/>
-
+	<!-- Forbids the use of TODO in the comments -->
 	<rule ref="Generic.Commenting.Todo"/>
+	<!-- Tests that the stars in a doc comment align correctly -->
 	<rule ref="Squiz.Commenting.DocCommentAlignment"/>
 
-	<!-- We allow EOL after closing braces -->
-	<rule ref="FHComplete.ControlStructures.ControlSignature"/>
-
-	<rule ref="Generic.Files.LineEndings"/>
+	<!-- Ensures the file ends with a newline character -->
+	<rule ref="Generic.Files.EndFileNewline"/>
 
+	<!-- Ensures there is no space after cast tokens -->
 	<rule ref="Generic.Formatting.NoSpaceAfterCast"/>
 
+	<!-- Ensures logical operators 'and' and 'or' are not used -->
 	<rule ref="Squiz.Operators.ValidLogicalOperators"/>
 
-	<rule ref="Squiz.PHP.Eval"/>
-	<rule ref="Squiz.PHP.NonExecutableCode"/>
-	<rule ref="Generic.PHP.NoSilencedErrors"/>
-	<rule ref="Generic.PHP.ForbiddenFunctions"/>
-	<rule ref="Generic.PHP.DeprecatedFunctions"/>
-
-	<rule ref="Squiz.Scope.MemberVarScope"/>
-	<rule ref="Squiz.Scope.StaticThisUsage"/>
-
+	<!-- Ensure cast statements don't contain whitespace -->
 	<rule ref="Squiz.WhiteSpace.CastSpacing"/>
-	<rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
-	<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
+	<!-- Verifies that operators have valid spacing surrounding them -->
 	<rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
+	<!-- Checks that control structures are defined and indented correctly -->
+	<!-- The listed tokens are ignored: comment, doc comment open tag, php close tag -->
+	<rule ref="Generic.WhiteSpace.ScopeIndent">
+		<properties>
+			<property name="ignoreIndentationTokens" type="array">
+				<element value="T_COMMENT"/>
+				<element value="T_DOC_COMMENT_OPEN_TAG"/>
+				<element value="T_CLOSE_TAG"/>
+			</property>
+		</properties>
+	</rule>
+	<!-- Ensure there is no whitespace before a semicolon -->
+	<rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
 
 	<!-- All rules in ./Sniffs are included automatically -->
+	<!-- FHComplete sniffs:
+		- Classes/FHCPropertyDeclarationSniff: class properties checks, it does not check if the property name starts with an underscore "_"
+		- Classes/FHCValidClassNameSniff: class names checks, it does not check if the class name contains an underscore "_"
+		- ControlStructures/FHCControlSignatureSniff:
+			- Does not force to have whitespaces after the brackets
+			- Allows to have a bracket at newline after a control structure
+		- Methods/FHCMethodDeclarationSniff: it does not check if the method name starts with an underscore "_"
+	-->
 </ruleset>
+
diff --git a/tests/codesniffer/FHComplete/tests/FHCompletePHPStandardTest.php b/tests/codesniffer/FHComplete/tests/FHCompletePHPStandardTest.php
deleted file mode 100644
index 8c933aa95..000000000
--- a/tests/codesniffer/FHComplete/tests/FHCompletePHPStandardTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * FHCompleteStandardTest
- */
-class FHCompleteStandardTest extends PHPUnit_Framework_TestCase {
-
-	public function setUp() {
-		parent::setUp();
-		if (empty($this->helper)) {
-			$this->helper = new TestHelper();
-		}
-	}
-
-/**
- * testFiles
- *
- * Run simple syntax checks, if the filename ends with pass.php - expect it to pass
- */
-	public static function testProvider() {
-		$tests = array();
-
-		$standard = dirname(dirname(__FILE__));
-
-		$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(dirname(__FILE__) . '/files'));
-		foreach ($iterator as $dir) {
-			if ($dir->isDir()) {
-				continue;
-			}
-
-			$file = $dir->getPathname();
-			$expectPass = (substr($file, -8) === 'pass.php');
-			$tests[] = array(
-				$file,
-				$standard,
-				$expectPass
-			);
-		}
-		return $tests;
-	}
-
-/**
- * _testFile
- *
- * @dataProvider testProvider
- *
- * @param string $file
- * @param string $standard
- * @param boolean $expectPass
- */
-	public function testFile($file, $standard, $expectPass) {
-		$outputStr = $this->helper->runPhpCs($file);
-		if ($expectPass) {
-			$this->assertNotRegExp(
-				"/FOUND \d+ ERROR/",
-				$outputStr,
-				basename($file) . ' - expected to pass with no errors, some were reported. '
-			);
-		} else {
-			$this->assertRegExp(
-				"/FOUND \d+ ERROR/",
-				$outputStr,
-				basename($file) . ' - expected failures, none reported. '
-			);
-		}
-	}
-
-}
diff --git a/tests/codesniffer/FHComplete/tests/TestHelper.php b/tests/codesniffer/FHComplete/tests/TestHelper.php
deleted file mode 100644
index 4d86b5fe4..000000000
--- a/tests/codesniffer/FHComplete/tests/TestHelper.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-if (!class_exists('PHP_CodeSniffer_CLI')) {
-	$composerInstall = dirname(dirname(dirname(__FILE__))) . '/vendor/squizlabs/php_codesniffer/CodeSniffer/CLI.php';
-	if (file_exists($composerInstall)) {
-		require_once $composerInstall;
-	} else {
-		require_once 'PHP/CodeSniffer/CLI.php';
-	}
-}
-
-class TestHelper {
-
-	protected $_phpcs;
-
-	public function __construct() {
-		$this->_phpcs = new PHP_CodeSniffer_CLI();
-	}
-
-/**
- * Run PHPCS on a file.
- *
- * @param string $file to run.
- * @return string The output from phpcs.
- */
-	public function runPhpCs($file) {
-		$defaults = $this->_phpcs->getDefaults();
-		$standard = dirname(__FILE__) . '/ruleset.xml';
-		if (
-			defined('PHP_CodeSniffer::VERSION') &&
-			version_compare(PHP_CodeSniffer::VERSION, '1.5.0') != -1
-		) {
-			$standard = array($standard);
-		}
-		$options = array(
-			'encoding' => 'utf-8',
-			'files' => array($file),
-			'standard' => $standard,
-			'showSources' => true,
-		) + $defaults;
-
-		// New PHPCS has a strange issue where the method arguments
-		// are not stored on the instance causing weird errors.
-		$reflection = new ReflectionProperty($this->_phpcs, 'values');
-		$reflection->setAccessible(true);
-		$reflection->setValue($this->_phpcs, $options);
-
-		ob_start();
-		$this->_phpcs->process($options);
-		$result = ob_get_contents();
-		ob_end_clean();
-		return $result;
-	}
-
-}
diff --git a/tests/codesniffer/FHComplete/tests/bootstrap.php b/tests/codesniffer/FHComplete/tests/bootstrap.php
deleted file mode 100644
index b6ef51c7c..000000000
--- a/tests/codesniffer/FHComplete/tests/bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-require_once dirname(__FILE__) . '/TestHelper.php';
diff --git a/tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php b/tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php
deleted file mode 100644
index b2c1d2a04..000000000
--- a/tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace FHComplete;
-
-use Other\Crap;
-use Other\Error as OtherError;
-
-class Throws
-{
-
-	/**
-	 * Test throws
-	 *
-	 * @throws Exception An expection happened.
-	 * @throws FHComplete\Boom A boom went off.
-	 * @throws FHComplete\Error\Boom Oh, shucks, another boom.
-	 * @throws Other\Crap Oh boy.
-	 * @throws Other\Error\Issue A missing tissue for your PSR-2 issues.
-	 * @return void
-	 */
-	public function test()
-	{
-		switch ($a) {
-			case 1:
-				throw new Boom();
-			case 2:
-				throw new Error\Boom();
-			case 3:
-				throw new OtherError\Issue();
-			case 4:
-				throw new Crap();
-			default:
-				throw new \Exception();
-		}
-	}
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/bad_trait_name.php b/tests/codesniffer/FHComplete/tests/files/bad_trait_name.php
deleted file mode 100644
index 9edaea2b2..000000000
--- a/tests/codesniffer/FHComplete/tests/files/bad_trait_name.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-trait Foo {
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/class_brackets_fail1.php b/tests/codesniffer/FHComplete/tests/files/class_brackets_fail1.php
deleted file mode 100644
index 40e3c1928..000000000
--- a/tests/codesniffer/FHComplete/tests/files/class_brackets_fail1.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-class NiceClass1 extends Object{
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/class_brackets_fail2.php b/tests/codesniffer/FHComplete/tests/files/class_brackets_fail2.php
deleted file mode 100644
index a73f05c44..000000000
--- a/tests/codesniffer/FHComplete/tests/files/class_brackets_fail2.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-class NiceClass1 extends Object {
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/class_brackets_fail3.php b/tests/codesniffer/FHComplete/tests/files/class_brackets_fail3.php
deleted file mode 100644
index aabc4ef24..000000000
--- a/tests/codesniffer/FHComplete/tests/files/class_brackets_fail3.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class NiceClass3 implements Object, Object2
- {
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/class_underscore_prefix_pass.php b/tests/codesniffer/FHComplete/tests/files/class_underscore_prefix_pass.php
deleted file mode 100644
index 4c2110404..000000000
--- a/tests/codesniffer/FHComplete/tests/files/class_underscore_prefix_pass.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-namespace FHC;
-
-class ClassWithUndercore extends Object
-{
-
-    protected $_someProp;
-
-    /**
-     * [_someFunc description]
-     *
-     * @return void
-     */
-    protected function _someFunc()
-    {
-        // code here
-    }
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php b/tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php
deleted file mode 100644
index 2584c3507..000000000
--- a/tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-for ($i = 0; $i < 10; $i++)
-{
-    echo 'hello';
-}
-
-if ($i < 10)
-{
-    echo 'hello2';
-}
-elseif ($i > 100)
-{
-    echo 'i > 100';
-}
-
-while (false)
-{
-    echo 'false';
-}
-
-do
-{
-    echo 'dowhile test';
-} while (false);
diff --git a/tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php b/tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php
deleted file mode 100644
index b423a48e0..000000000
--- a/tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-do
-{
-        echo 'dowhile test';
-}
-while (false);
diff --git a/tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php b/tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php
deleted file mode 100644
index 2cff04006..000000000
--- a/tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-if (isset($a))
-{
-	echo 'a isset';
-}
-elseif (isset($b))
-{
-	echo 'b isset';
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php b/tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php
deleted file mode 100644
index 6c6f6084d..000000000
--- a/tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-if ($value)
-{
-	$thing = 'test';
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/control_structure_nobrackets.php b/tests/codesniffer/FHComplete/tests/files/control_structure_nobrackets.php
deleted file mode 100644
index 31836eff4..000000000
--- a/tests/codesniffer/FHComplete/tests/files/control_structure_nobrackets.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-if($abc == true)
-        echo 'hello';
diff --git a/tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php b/tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php
deleted file mode 100644
index 5988c0b4e..000000000
--- a/tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-if(isset($test))
-{
-	echo 'hello';
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/control_structure_while.php b/tests/codesniffer/FHComplete/tests/files/control_structure_while.php
deleted file mode 100644
index 10e7db8e2..000000000
--- a/tests/codesniffer/FHComplete/tests/files/control_structure_while.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-while (false)
-        echo 'false';
-
diff --git a/tests/codesniffer/FHComplete/tests/files/control_structures_no_newline.php b/tests/codesniffer/FHComplete/tests/files/control_structures_no_newline.php
deleted file mode 100644
index 094b133c2..000000000
--- a/tests/codesniffer/FHComplete/tests/files/control_structures_no_newline.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-if ($condition)
-{
-	$thing = 'test';
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php b/tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php
deleted file mode 100644
index 6134c4124..000000000
--- a/tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-    /**
-     * Tell me what worries you.
-     */
-namespace App\Person\Patient;
-
-/**
- * Hello World.
- *
- * This is a description.
- */
-class Foo extends Bar
-{
-	/**
-	 * What are your thoughts?
-	 *
-	 * @var array $brain
-	 */
-	public $brain = array();
-
-/**
- * Tell me your thoughts.
- *
- * @return void
- */
-	public function dumpThoughts()
-	{
-		foreach ($thoughts as $thought)
-		{
-			echo $thought;
-		}
-	}
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php b/tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php
deleted file mode 100644
index 6cea31090..000000000
--- a/tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Hello World.
- *
- * This is a description.
- */
-$things = 'fun';
-
-/**
- * I'm static.
- */
-Foo::bar($things);
-
-$anotherThing = 'what';
-
-/**
- * What happens with If's?
- *
- */
-if ($anotherThing !== 'notfun')
-{
-    $anotherThing = 'Oh no.';
-}
-
-$hello = 'world';
diff --git a/tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php b/tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php
deleted file mode 100644
index 0fc7d2f34..000000000
--- a/tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-namespace FHC;
-
-/**
- * Hello World.
- *
- * This is a description.
- */
-class Foo extends Bar
-{
-	/**
-	 * What are your thoughts?
-	 *
-	 * @var array $brain
-	 */
-	public $brain = array();
-
-	/**
-	 * Tell me your thoughts.
-	 *
-	 * @return void
-	 */
-	public function dumpThoughts()
-	{
-		foreach ($thoughts as $thought)
-		{
-			echo $thought;
-		}
-	}
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/double_space.php b/tests/codesniffer/FHComplete/tests/files/double_space.php
deleted file mode 100644
index 1cda4505b..000000000
--- a/tests/codesniffer/FHComplete/tests/files/double_space.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$var  = 'double space';
diff --git a/tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php b/tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php
deleted file mode 100644
index 4a86461b9..000000000
--- a/tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace Beakman;
-
-class Foo
-{
-	/**
-	 * [doThing description]
-	 *
-	 * @param string $foo Foo foo foo.
-	 * @return void
-	 */
-	public function doThing($foo)
-	{
-	}
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_pass.php b/tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_pass.php
deleted file mode 100644
index e0dea3d15..000000000
--- a/tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_pass.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace Beakman;
-
-class Foo
-{
-    /**
-     * Some sentence.
-     *
-     * @return void
-     */
-    public function bar()
-    {
-    }
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/function_spacing.php b/tests/codesniffer/FHComplete/tests/files/function_spacing.php
deleted file mode 100644
index 476657c71..000000000
--- a/tests/codesniffer/FHComplete/tests/files/function_spacing.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$noGood = empty ($thing);
-$fail = include ('./inline_if_pass.php');
-$o = $obj->something ('testing');
-fail_whale ();
diff --git a/tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php b/tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php
deleted file mode 100644
index 014d02a5f..000000000
--- a/tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-$foo = -1;
-
-switch($foo)
-{
-	case -1:
-		break;
-	case 'negative':
-		return -1;
-}
-$bar = isset($foo) ? -2 : 0;
-$foo = isset($bar) ? 0 : -2;
-$ten = 10 * 2;
-$ten = -10 * 2;
-$ten = 10 / -2;
-$ten = -10 / 2;
-$ten = -10 + 2;
-$ten = 10 + -2;
-$ten = -10 - 2;
-$ten = 10 - -2;
-$dec = -0.001;
-$dec = -1;
-
-$arr = [-1];
-$refArr = [&$foo];
-$refArr = [$bar, &$foo];
diff --git a/tests/codesniffer/FHComplete/tests/files/short_open_tags_fail.php b/tests/codesniffer/FHComplete/tests/files/short_open_tags_fail.php
deleted file mode 100644
index e1beef49e..000000000
--- a/tests/codesniffer/FHComplete/tests/files/short_open_tags_fail.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * If shortopen tags are not enabled phpcs will report that the file has no php code
- * Ensure that there is some php code to skip that logic
- */
-$ensure = 'some php code'; ?>
-
-<?
-echo "this should fail";
diff --git a/tests/codesniffer/FHComplete/tests/files/short_open_tags_pass.php b/tests/codesniffer/FHComplete/tests/files/short_open_tags_pass.php
deleted file mode 100644
index 0bdfd43fb..000000000
--- a/tests/codesniffer/FHComplete/tests/files/short_open_tags_pass.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-// If shortopen tags are not enabled phpcs will report that the file has no php code
-// Ensure that there is some php code to skip that logic
-$ensure = 'some php code'; ?>
-
-<?= "this should pass";
diff --git a/tests/codesniffer/FHComplete/tests/files/space_tab.php b/tests/codesniffer/FHComplete/tests/files/space_tab.php
deleted file mode 100644
index b6f683a58..000000000
--- a/tests/codesniffer/FHComplete/tests/files/space_tab.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$var 	= 'space and tab';
diff --git a/tests/codesniffer/FHComplete/tests/files/tab_space.php b/tests/codesniffer/FHComplete/tests/files/tab_space.php
deleted file mode 100644
index e3dbff301..000000000
--- a/tests/codesniffer/FHComplete/tests/files/tab_space.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$var	 = 'tab and space';
\ No newline at end of file
diff --git a/tests/codesniffer/FHComplete/tests/files/traits_no_order.php b/tests/codesniffer/FHComplete/tests/files/traits_no_order.php
deleted file mode 100644
index 75fef1a2b..000000000
--- a/tests/codesniffer/FHComplete/tests/files/traits_no_order.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-use One;
-use Two;
-
-class Foo
-{
-	use LogTrait;
-	use FirstTrait;
-}
diff --git a/tests/codesniffer/FHComplete/tests/files/traits_pass.php b/tests/codesniffer/FHComplete/tests/files/traits_pass.php
deleted file mode 100644
index 727577bcc..000000000
--- a/tests/codesniffer/FHComplete/tests/files/traits_pass.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-namespace Beakman;
-
-use FHC\Last;
-use FHC\More;
-
-class Foo
-{
-
-	use BarTrait;
-	use FirstTrait
-	{
-		foo as bar;
-		config as protected _config;
-	}
-}
diff --git a/tests/phpmd/rulesets-dev-only.xml b/tests/phpmd/rulesets-dev-only.xml
new file mode 100644
index 000000000..61d2dcb5f
--- /dev/null
+++ b/tests/phpmd/rulesets-dev-only.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<ruleset name="Strictly necessary PHPMD rule set"
+	xmlns="http://pmd.sf.net/ruleset/1.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+	xsi:noNamespaceSchemaLocation=" http://pmd.sf.net/ruleset_xml_schema.xsd">
+
+	<description>
+		Performs the DevelopmentCodeFragment check before the code can be merged into the main branch and then deployed to production
+	</description>
+
+	<!-- Ignored directories -->
+	<exclude-pattern>\.git</exclude-pattern>
+	<exclude-pattern>vendor</exclude-pattern>
+	<exclude-pattern>tests</exclude-pattern>
+	<exclude-pattern>application/controllers/api/v1</exclude-pattern>
+	<exclude-pattern>application/extensions</exclude-pattern>
+	<exclude-pattern>addons</exclude-pattern>
+
+	<!-- Import the DevelopmentCodeFragment rule from the design rule set -->
+	<rule ref="rulesets/design.xml/DevelopmentCodeFragment" />
+</ruleset>
+
diff --git a/tests/phpmd/rulesets.xml b/tests/phpmd/rulesets.xml
new file mode 100644
index 000000000..d162cd892
--- /dev/null
+++ b/tests/phpmd/rulesets.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<ruleset name="Strictly necessary PHPMD rule set"
+	xmlns="http://pmd.sf.net/ruleset/1.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+	xsi:noNamespaceSchemaLocation=" http://pmd.sf.net/ruleset_xml_schema.xsd">
+
+	<description>
+		Performs the strictly necessary checks before the code can be merged into the main branch and then deployed to production
+	</description>
+
+	<!-- Ignored directories -->
+	<exclude-pattern>\.git</exclude-pattern>
+	<exclude-pattern>vendor</exclude-pattern>
+	<exclude-pattern>tests</exclude-pattern>
+	<exclude-pattern>application/controllers/api/v1</exclude-pattern>
+	<exclude-pattern>application/extensions</exclude-pattern>
+	<exclude-pattern>addons</exclude-pattern>
+
+	<!-- Import the clean code rule set -->
+	<rule ref="rulesets/cleancode.xml">
+		<!-- Exclude the ElseExpression rule -->
+		<exclude name="ElseExpression" />
+	</rule>
+	<!-- Import the entire unused code rule set -->
+	<rule ref="rulesets/unusedcode.xml" />
+	<!-- Import the DevelopmentCodeFragment rule from the design rule set -->
+	<rule ref="rulesets/design.xml/DevelopmentCodeFragment" />
+</ruleset>
+
diff --git a/vilesci/bis/studentenmeldung.php b/vilesci/bis/studentenmeldung.php
index 3842f7074..dd21574f3 100644
--- a/vilesci/bis/studentenmeldung.php
+++ b/vilesci/bis/studentenmeldung.php
@@ -150,15 +150,17 @@ else
 }
 
 /*
+Obsolete - Standort wird nun aus DB geholt
  standortcode 22=Wien
 derzeit fuer alle Studierende der gleiche Standort
 ToDo: Standort sollte pro Student konfigurierbar sein.
-*/
+
 $standortcode='22';
 if(in_array($stg_kz,array('265','268','761','760','266','267','764','269','400','794','795','786','859','871')))
 	$standortcode='14'; // Pinkafeld
 elseif(in_array($stg_kz,array('639','640','263','743','364','635','402','401','725','264','271','781')))
 	$standortcode='3'; // Eisenstadt
+*/
 
 $datumobj=new datum();
 
@@ -192,13 +194,17 @@ if ($stg_kz != 'alleBaMa')
 {
 	$qry_akt = "
 		SELECT
-			DISTINCT ON(student_uid, nachname, vorname) *, public.tbl_person.person_id AS pers_id
+			DISTINCT ON(student_uid, nachname, vorname) *,
+			public.tbl_person.person_id AS pers_id,
+			public.tbl_prestudent.foerderrelevant as pre_foerderrelevant,
+			public.tbl_studiengang.foerderrelevant as stg_foerderrelevant
 		FROM
 			public.tbl_student
 			JOIN public.tbl_benutzer ON(student_uid=uid)
 			JOIN public.tbl_person USING (person_id)
 			JOIN public.tbl_prestudent USING (prestudent_id)
 			JOIN public.tbl_prestudentstatus ON(tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id)
+			JOIN public.tbl_studiengang ON (tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz)
 		WHERE
 			bismelden=FALSE
 			AND tbl_student.studiengang_kz=".$db->db_add_param($stg_kz)."
@@ -228,13 +234,17 @@ if ($stg_kz != 'alleBaMa')
 //Incoming ohne I/O Datensatz anzeigen
 	$qry_in = "
 	SELECT
-		DISTINCT ON(student_uid, nachname, vorname) *, public.tbl_person.person_id AS pers_id
+		DISTINCT ON(student_uid, nachname, vorname) *,
+		public.tbl_person.person_id AS pers_id,
+		public.tbl_prestudent.foerderrelevant as pre_foerderrelevant,
+		public.tbl_studiengang.foerderrelevant as stg_foerderrelevant
 	FROM
 		public.tbl_student
 		JOIN public.tbl_benutzer ON(student_uid=uid)
 		JOIN public.tbl_person USING (person_id)
 		JOIN public.tbl_prestudent USING (prestudent_id)
 		JOIN public.tbl_prestudentstatus ON(tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id)
+		JOIN public.tbl_studiengang ON (tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz)
 	WHERE
 		bismelden=TRUE
 		AND tbl_student.studiengang_kz=".$db->db_add_param($stg_kz)."
@@ -257,13 +267,17 @@ if (CAMPUS_NAME == 'FH Technikum Wien' && $stg_kz==10006)
 {
 	$qry="
 	SELECT
-		DISTINCT ON(student_uid, nachname, vorname) *, public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat
+		DISTINCT ON(student_uid, nachname, vorname) *,
+		public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat,
+		public.tbl_prestudent.foerderrelevant as pre_foerderrelevant,
+		public.tbl_studiengang.foerderrelevant as stg_foerderrelevant
 	FROM
 		public.tbl_student
 		JOIN public.tbl_benutzer ON(student_uid=uid)
 		JOIN public.tbl_person USING (person_id)
 		JOIN public.tbl_prestudent USING (prestudent_id)
 		JOIN public.tbl_prestudentstatus ON(tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id)
+		JOIN public.tbl_studiengang ON (tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz)
 	WHERE
 		bismelden=TRUE
 		AND (status_kurzbz='Incoming' AND student_uid IN (SELECT student_uid FROM bis.tbl_bisio WHERE (tbl_bisio.bis>=".$db->db_add_param($bisprevious).")
@@ -277,7 +291,10 @@ elseif ($stg_kz == 'alleBaMa')
 {
 	$qry="
 	SELECT
-		DISTINCT ON(tbl_student.studiengang_kz, matrikelnr, nachname, vorname) *, public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat
+		DISTINCT ON(tbl_student.studiengang_kz, matrikelnr, nachname, vorname) *,
+		public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat,
+		public.tbl_prestudent.foerderrelevant as pre_foerderrelevant,
+		public.tbl_studiengang.foerderrelevant as stg_foerderrelevant
 	FROM
 		public.tbl_student
 		JOIN public.tbl_benutzer ON(student_uid=uid)
@@ -304,13 +321,17 @@ else
 {
 	$qry="
 	SELECT
-		DISTINCT ON(student_uid, nachname, vorname) *, public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat
+		DISTINCT ON(student_uid, nachname, vorname) *,
+		public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat,
+		public.tbl_prestudent.foerderrelevant as pre_foerderrelevant,
+		public.tbl_studiengang.foerderrelevant as stg_foerderrelevant
 	FROM
 		public.tbl_student
 		JOIN public.tbl_benutzer ON(student_uid=uid)
 		JOIN public.tbl_person USING (person_id)
 		JOIN public.tbl_prestudent USING (prestudent_id)
 		JOIN public.tbl_prestudentstatus ON(tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id)
+		JOIN public.tbl_studiengang ON (tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz)
 	WHERE
 		bismelden=TRUE
 		AND tbl_student.studiengang_kz=".$db->db_add_param($stg_kz)."
@@ -329,16 +350,22 @@ else
 
 if($result = $db->db_query($qry))
 {
+
 	$stg_kz_index = '';
 
 	while($row = $db->db_fetch_object($result))
 	{
+		$row->pre_foerderrelevant = $db->db_parse_bool($row->pre_foerderrelevant);
+		$row->stg_foerderrelevant = $db->db_parse_bool($row->stg_foerderrelevant);
+
 		if ($row->studiengang_kz != $stg_kz_index)
 		{
 			//Studiengangsdaten auslesen
 			$stg_obj = new studiengang();
 			if($stg_obj->load($row->studiengang_kz))
 			{
+				
+
 				$maxsemester = $stg_obj->max_semester;
 				if($maxsemester == 0)
 				{
@@ -747,7 +774,8 @@ function GenerateXMLStudentBlock($row)
 	global $v;
 	global $stgart, $maxsemester, $orgform_kurzbz, $bisprevious,$anzahl_fehler;
 	global $iosem, $stsem, $usem, $asem, $absem, $stlist, $gssem;
-	global $verwendete_orgformen, $datum_obj,$orgform_code_array,$standortcode;
+	//global $verwendete_orgformen, $datum_obj,$orgform_code_array,$standortcode;
+	global $verwendete_orgformen, $datum_obj,$orgform_code_array;
 	global $kodex_studientyp_array, $kodex_studstatuscode_array;
 	global $stg_kz;
 	$error_log='';
@@ -1491,7 +1519,7 @@ function GenerateXMLStudentBlock($row)
 		if(!$ausserordentlich)
 		{
 			$datei.="
-			<StandortCode>".$standortcode."</StandortCode>";
+			<StandortCode>".$row->standort_code."</StandortCode>";
 		}
 		/*
 		 * BMWFFoerderrung derzeit fuer alle Studierende auf Ja gesetzt
@@ -1502,15 +1530,26 @@ function GenerateXMLStudentBlock($row)
 		 *
 		 * ToDo: sollte pro Studierenden konfigurierbar sein
 		 */
-		if($aktstatus=='Incoming' || $ausserordentlich
-			|| ($gemeinsamestudien && $kodex_studientyp_array[$row->gsstudientyp_kurzbz]=='E'))
-			$bmwf='N';
-		else
+		//if($aktstatus=='Incoming' || $ausserordentlich
+		//	|| ($gemeinsamestudien && $kodex_studientyp_array[$row->gsstudientyp_kurzbz]=='E'))
+		//	$bmwf='N';
+		//else
+		//	$bmwf='J';
+
+		if ($row->pre_foerderrelevant === true) {
 			$bmwf='J';
+		} else if ($row->pre_foerderrelevant === false) {
+			$bmwf='N';
+		} else if ($row->stg_foerderrelevant === true) {
+			$bmwf='J';
+		} else {
+			$bmwf='N';
+		}
 
 		$datei.="
 			<BMWFWfoerderrelevant>".$bmwf."</BMWFWfoerderrelevant>";
 
+
 		// **** IO Container ****/
 		$qryio="SELECT * FROM bis.tbl_bisio WHERE student_uid=".$db->db_add_param($row->student_uid)."
 					AND (von>".$db->db_add_param($bisprevious)." OR bis IS NULL OR bis>".$db->db_add_param($bisprevious).")
diff --git a/vilesci/personen/kontaktdaten_edit.php b/vilesci/personen/kontaktdaten_edit.php
index 198809b2d..a882b1350 100644
--- a/vilesci/personen/kontaktdaten_edit.php
+++ b/vilesci/personen/kontaktdaten_edit.php
@@ -27,6 +27,7 @@ require_once('../../include/benutzerberechtigung.class.php');
 require_once('../../include/person.class.php');
 require_once('../../include/datum.class.php');
 require_once('../../include/adresse.class.php');
+require_once('../../include/adressentyp.class.php');
 require_once('../../include/nation.class.php');
 require_once('../../include/firma.class.php');
 require_once('../../include/standort.class.php');
@@ -70,11 +71,11 @@ if(isset($_GET['getstandort']))
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<link href="../../skin/vilesci.css" rel="stylesheet" type="text/css">
 	<link rel="stylesheet" href="../../skin/styles/jquery.css" rel="stylesheet" type="text/css">
-	<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
-<script type="text/javascript" src="../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
-<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
-<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
+	<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
+<script type="text/javascript" src="../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
+<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
+<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
 <script type="text/javascript" src="../../vendor/jquery/sizzle/sizzle.js"></script>
 	<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js" ></script>
 
@@ -260,8 +261,6 @@ if(isset($_POST['saveadresse']))
 		$adresse_obj->updateamum = date('Y-m-d H:i:s');
 		$adresse_obj->updatvon = $user;
 
-		//var_dump($adresse_obj);
-
 		if(!$adresse_obj->save())
 		{
 			$errormsg = 'Fehler beim Speichern der Adresse:'.$adresse_obj->errormsg;
@@ -342,8 +341,6 @@ $firma->getAll();
 foreach($firma->result as $row)
 	$firma_arr[$row->firma_id]=$row->name;
 
-$adresstyp_arr = array('h'=>'Hauptwohnsitz','n'=>'Nebenwohnsitz','f'=>'Firma');
-
 //Kontakttypen laden
 $kontakttyp_arr = array();
 $kontakt_obj = new kontakt();
@@ -369,7 +366,7 @@ foreach ($adresse_obj->result as $row)
 	echo "<td>$row->ort</td>";
 	echo "<td>$row->gemeinde</td>";
 	echo "<td>".(isset($nation_arr[$row->nation])?$nation_arr[$row->nation]:'')."</td>";
-	echo "<td>".(isset($adresstyp_arr[$row->typ])?$adresstyp_arr[$row->typ]:'')."</td>";
+	echo "<td>".(isset($row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE])?$row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE]:'')."</td>";
 	echo "<td>".($row->heimatadresse?'Ja':'Nein')."</td>";
 	echo "<td>".($row->zustelladresse?'Ja':'Nein')."</td>";
 	echo "<td>".($row->firma_id!=''?$firma_arr[$row->firma_id]:'')."</td>";
@@ -426,15 +423,19 @@ else
 	}
 
 	echo "</SELECT></td>";
+
+	$adressetyp = new adressentyp();
+	$adressetyp->getAll();
+
 	echo "<td><SELECT name='adresstyp'>";
-	foreach($adresstyp_arr as $code=>$kurzbz)
+	foreach($adressetyp->result as $row)
 	{
-		if($code==$typ)
+		if($row->adressentyp==$typ)
 			$selected='selected';
 		else
 			$selected='';
 
-		echo "<OPTION value='$code' $selected>$kurzbz</OPTION>";
+		echo "<OPTION value='". $row->adressentyp ."' $selected>$row->bezeichnung</OPTION>";
 	}
 	echo "</SELECT></td>";
 	echo "<td><input type='checkbox' name='heimatadresse' ".($heimatadresse?'checked':'')." /></td>";
diff --git a/vilesci/personen/personendetails.php b/vilesci/personen/personendetails.php
index a14a178fb..a20e34c5d 100644
--- a/vilesci/personen/personendetails.php
+++ b/vilesci/personen/personendetails.php
@@ -191,8 +191,6 @@ $nation_arr['']='';
 foreach($nation->nation as $row)
 	$nation_arr[$row->code]=$row->kurztext;
 
-$adresstyp_arr = array(''=>'','h'=>'Hauptwohnsitz','n'=>'Nebenwohnsitz','f'=>'Firma');
-
 // *** ADRESSEN ***
 echo '<h3>Adressen:</h3>';
 echo '<table class="tablesorter" data-sortlist="[[7,0],[0,0]]">
@@ -222,7 +220,7 @@ foreach ($adresse_obj->result as $row)
 	echo "<td>$row->ort</td>";
 	echo "<td>$row->gemeinde</td>";
 	echo "<td>".$nation_arr[$row->nation]."</td>";
-	echo "<td>".$adresstyp_arr[$row->typ]."</td>";
+	echo "<td>".$row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE]."</td>";
 	echo "<td>".($row->heimatadresse?'Ja':'Nein')."</td>";
 	echo "<td>".($row->zustelladresse?'Ja':'Nein')."</td>";
 	$firma=new firma();