psr-4 autoloading standard

38 files changed, 0 insertions, 3404 deletions

diff --git a/tests/README.md b/tests/README.md
deleted file mode 100644
index 395333159..000000000
--- a/tests/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-The folder tests/ contains resources for automated testing tools.
-
-Here you will find PHPUnit, Behat, etc. files to test the functionaly
-of Hubzilla. Right now it only contains some basic tests to see if feasable
-this can help improve the project.
-
-# Contents
-
-* unit/           PHPUnit tests
-These are unit tests to check the smallest parts, like single functions.
-It uses the tool PHPUnit https://phpunit.de/
-
-* acceptance/     functional/acceptance testing
-These are behavioral or so called functional/acceptance testing. They
-are used to test business logic. They are written in Gherkin and use
-the tool Behat http://behat.org/
-
-# How to use?
-You need the dev tools which are defined in the composer.json in the
-require-dev configuration.
-Run ```composer install``` without --no-dev to install these tools.
-
-To run unit tests run ```vendor/bin/phpunit tests/unit/```
-
-To run acceptance tests run ```vendor/bin/behat --config tests/acceptance/behat.yml```
diff --git a/tests/acceptance/behat.yml b/tests/acceptance/behat.yml
deleted file mode 100644
index 933571e5e..000000000
--- a/tests/acceptance/behat.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-default:
-  suites:
-    default:
-      paths:
-        - %paths.base%/features
-      contexts:
-        - Behat\MinkExtension\Context\MinkContext
-    admin_features:
-      filters: { role: admin }
-      contexts:
-        - AdminContext
-    api_features:
-      paths:
-        - %paths.base%/features/api
-      filters:
-        tags: "@api"
-      contexts:
-        - ApiContext
-  gherkin:
-    filters:
-      tags: ~@wip
-  extensions:
-    Behat\MinkExtension:
-      base_url: 'http://localhost'
-      sessions:
-        default:
-          goutte: ~
diff --git a/tests/acceptance/features/bootstrap/AdminContext.php b/tests/acceptance/features/bootstrap/AdminContext.php
deleted file mode 100644
index aa4dced67..000000000
--- a/tests/acceptance/features/bootstrap/AdminContext.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-use Behat\Behat\Context\Context;
-use Behat\Behat\Context\SnippetAcceptingContext;
-use Behat\Gherkin\Node\PyStringNode;
-use Behat\Gherkin\Node\TableNode;
-
-/**
- * Defines application features from the specific context.
- */
-class AdminContext implements Context, SnippetAcceptingContext
-{
-    /**
-     * Initializes context.
-     *
-     * Every scenario gets its own context instance.
-     * You can also pass arbitrary arguments to the
-     * context constructor through behat.yml.
-     */
-    public function __construct()
-    {
-    }
-}
diff --git a/tests/acceptance/features/bootstrap/ApiContext.php b/tests/acceptance/features/bootstrap/ApiContext.php
deleted file mode 100644
index 9b772b209..000000000
--- a/tests/acceptance/features/bootstrap/ApiContext.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-use Behat\Behat\Context\Context;
-use Behat\Behat\Context\SnippetAcceptingContext;
-use Behat\Gherkin\Node\PyStringNode;
-use Behat\Gherkin\Node\TableNode;
-
-/**
- * Defines application features from the specific context.
- */
-class ApiContext implements Context, SnippetAcceptingContext
-{
-    /**
-     * Initializes context.
-     *
-     * Every scenario gets its own context instance.
-     * You can also pass arbitrary arguments to the
-     * context constructor through behat.yml.
-     */
-    public function __construct()
-    {
-    }
-}
diff --git a/tests/acceptance/features/bootstrap/FeatureContext.php b/tests/acceptance/features/bootstrap/FeatureContext.php
deleted file mode 100644
index 2ec02da85..000000000
--- a/tests/acceptance/features/bootstrap/FeatureContext.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-use Behat\Behat\Context\Context;
-use Behat\Behat\Context\SnippetAcceptingContext;
-use Behat\Gherkin\Node\PyStringNode;
-use Behat\Gherkin\Node\TableNode;
-
-/**
- * Defines application features from the specific context.
- */
-class FeatureContext implements Context, SnippetAcceptingContext
-{
-    /**
-     * Initializes context.
-     *
-     * Every scenario gets its own context instance.
-     * You can also pass arbitrary arguments to the
-     * context constructor through behat.yml.
-     */
-    public function __construct()
-    {
-    }
-}
diff --git a/tests/acceptance/features/login_local.feature b/tests/acceptance/features/login_local.feature
deleted file mode 100644
index a7814b8f6..000000000
--- a/tests/acceptance/features/login_local.feature
+++ /dev/null
@@ -1,18 +0,0 @@
-Feature: Local login
-  In order to login locally
-  As a member
-  I need to successfully authenticate
-
-  Scenario: Provide wrong credentials
-    Given I am on "/login"
-    When I fill in "id_username" with "foo"
-    And I fill in "id_password" with "bar"
-    And I press "submit"
-    Then I should be on "/login" 
-
-  Scenario: Provide correct credentials
-    Given I am on "/login"
-    When I fill in "id_username" with "behat"
-    And I fill in "id_password" with "behat"
-    And I press "submit"
-    Then I should be on "/apps"
diff --git a/tests/infection.json.dist b/tests/infection.json.dist
deleted file mode 100644
index 36b251982..000000000
--- a/tests/infection.json.dist
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "timeout": 13,
-    "source": {
-        "directories": [
-            "include",
-            "Zotlabs"
-        ]
-    },
-    "logs": {
-        "text": "tests/results/infection-log.txt"
-    },
-    "phpUnit": {
-        "configDir": "tests"
-    }
-}
diff --git a/tests/phpunit-pgsql.xml b/tests/phpunit-pgsql.xml
deleted file mode 100644
index 8b11aae31..000000000
--- a/tests/phpunit-pgsql.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
-         bootstrap="../boot.php"
-         forceCoversAnnotation="false"
-         beStrictAboutCoversAnnotation="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         verbose="true">
-    <testsuites>
-        <testsuite name="Hubzilla default Test Suite">
-            <directory suffix="Test.php">./unit/</directory>
-        </testsuite>
-        <testsuite name="API Test Suite">
-            <directory suffix="Test.php" prefix="API">./unit/</directory>
-        </testsuite>
-    </testsuites>
-    <groups>
-        <exclude>
-            <group>mysql</group>
-        </exclude>
-    </groups>
-    <!--coverage reporting-->
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">../Zotlabs/</directory>
-            <directory suffix=".php">../include/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="junit" target="./results/junit.xml"/>
-        <!--<log type="coverage-clover" target="./results/coverage-clover.xml"/>-->
-        <log type="coverage-html" target="./results/coverage-report/" lowUpperBound="35"
-        highLowerBound="70"/>
-        <!--<log type="testdox-text" target="./results/testdox.txt"/>-->
-        <log type="testdox-html" target="./results/testdox.html"/>
-    </logging>
-    <php>
-        <!-- Default test database config, only used if no environment variables
-             with same names are set.
-             !!! Never run against a real database, it will truncate all tables -->
-        <env name="hz_db_server" value="postgres"/>
-        <env name="hz_db_scheme" value="pgsql"/>
-        <env name="hz_db_port" value="5432"/>
-        <env name="hz_db_user" value="ci-user"/>
-        <env name="hz_db_pass" value="ci-pass"/>
-        <env name="hz_db_database" value="ci-db"/>
-    </php>
-</phpunit>
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
deleted file mode 100644
index 0a5bc2b35..000000000
--- a/tests/phpunit.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="../boot.php" colors="true">
-	<php>
-		<var name="db_dsn" value="mysql:dbname=gitlab_ci_hubzilla;host=mysql"/>
-		<var name="db_username" value="root"/>
-		<var name="db_password" value="mysql"/>
-
-		<env name="hz_db_server" value="mysql"/>
-		<env name="hz_db_scheme" value="mysql"/>
-		<env name="hz_db_port" value=""/>
-		<env name="hz_db_user" value="root"/>
-		<env name="hz_db_pass" value="mysql"/>
-		<env name="hz_db_database" value="hello_world_test"/>
-	</php>
-
-	<testsuites>
-		<testsuite name="Hubzilla default Test Suite">
-			<directory suffix="Test.php">./unit/</directory>
-		</testsuite>
-		<testsuite name="API Test Suite">
-			<directory suffix="Test.php" prefix="API">./unit/</directory>
-		</testsuite>
-		<testsuite name="Ex-/Import Test Suite">
-			<!--<directory suffix="Test.php">./unit/eximport/</directory>-->
-		</testsuite>
-	</testsuites>
-
-	<groups>
-		<exclude>
-			<group>postgresql</group>
-		</exclude>
-	</groups>
-	<!--cover reporting-->
-	<filter>
-		<whitelist processUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">../Zotlabs/</directory>
-			<directory suffix=".php">../include/</directory>
-		</whitelist>
-	</filter>
-</phpunit>
-
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
deleted file mode 100644
index 97c84fb81..000000000
--- a/tests/phpunit.xml.dist
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
-         bootstrap="../boot.php"
-         forceCoversAnnotation="false"
-         beStrictAboutCoversAnnotation="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         verbose="true">
-    <testsuite name="Hubzilla default Test Suite">
-        <directory suffix="Test.php">./unit/</directory>
-    </testsuite>
-    <testsuite name="API Test Suite">
-        <directory suffix="Test.php" prefix="API">./unit/</directory>
-    </testsuite>
-    <testsuite name="Ex-/Import Test Suite">
-        <!--<directory suffix="Test.php">./unit/eximport/</directory>-->
-    </testsuite>
-    <groups>
-        <exclude>
-            <group>postgresql</group>
-        </exclude>
-    </groups>
-    <!--cover reporting-->
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">../Zotlabs/</directory>
-            <directory suffix=".php">../include/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="junit" target="./results/junit.xml" logIncompleteSkipped="false"/>
-        <log type="coverage-clover" target="./results/coverage-clover.xml"/>
-        <log type="coverage-html" target="./results/coverage-report/" lowUpperBound="35"
-        highLowerBound="70"/>
-        <log type="testdox-text" target="./results/testdox.txt"/>
-    </logging>
-    <php>
-        <!-- Default test database config, only used if no environment variables
-             with same names are set.
-             !!! Never run against a real database, it will truncate all tables -->
-        <env name="hz_db_server" value="127.0.0.1"/>
-        <env name="hz_db_scheme" value="mysql"/>
-        <env name="hz_db_port" value="3306"/>
-        <env name="hz_db_user" value="travis_hz"/>
-        <env name="hz_db_pass" value="hubzilla"/>
-        <env name="hz_db_database" value="travis_hubzilla"/>
-    </php>
-</phpunit>
diff --git a/tests/travis/gen_apidocs.sh b/tests/travis/gen_apidocs.sh
deleted file mode 100755
index e5938e1e8..000000000
--- a/tests/travis/gen_apidocs.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# Copyright (c) 2016 Hubzilla
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-
-# Exit if anything fails
-set -e
-
-# Only create and deploy API documentation once, on first build job.
-# Waiting for upcoming 'Build Stages' Q1/Q2 2017 to make this cleaner.
-# https://github.com/travis-ci/travis-ci/issues/929
-if [[ "$TRAVIS_JOB_NUMBER" != "${TRAVIS_BUILD_NUMBER}.1" ]]; then
-	echo "Not the first build job. Creating API documentation only once is enough."
-	echo "We are finished ..."
-	exit
-fi
-
-echo "Doxygen version >= 1.8 is required"
-doxygen --version
-
-# Check if newer version of Doxygen should be used
-if [ ! -z "$DOXY_VER" ]; then
-	export DOXY_BINPATH=$HOME/doxygen/doxygen-$DOXY_VER/bin
-	if [ ! -e "$DOXY_BINPATH/doxygen" ]; then
-		echo "Installing newer Doxygen $DOXY_VER ..."
-		mkdir -p $HOME/doxygen && cd $HOME/doxygen
-		wget -O - http://ftp.stack.nl/pub/users/dimitri/doxygen-$DOXY_VER.linux.bin.tar.gz | tar xz
-		export PATH=$DOXY_BINPATH:$PATH
-	fi
-	echo "Doxygen version"
-	doxygen --version
-fi
-
-echo "Generating Doxygen API documentation ..."
-cd $TRAVIS_BUILD_DIR
-mkdir -p ./doc/html
-# Redirect stderr and stdout to log file and console to be able to review documentation errors
-doxygen $DOXYFILE 2>&1 | tee ./doc/html/doxygen.log
-
-# Check if Doxygen successfully created the documentation
-if [ -d "doc/html" ] && [ -f "doc/html/index.html" ]; then
-	echo "API documentation generated"
-	if [ -n "${TRAVIS_TAG}" ]; then
-		echo "Generate API documentation archive for release deployment ..."
-		zip -9 -r -q doc/hubzilla-api-documentation.zip doc/html/
-	fi
-else
-	echo "No API documentation files have been found" >&2
-	exit 1
-fi
diff --git a/tests/travis/prepare.sh b/tests/travis/prepare.sh
deleted file mode 100755
index 267b4ec46..000000000
--- a/tests/travis/prepare.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# Copyright (c) 2016 Hubzilla
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-
-# Exit if anything fails
-set -e
-
-# gd is required, show some info about the used one
-php -r "var_dump(gd_info());"
-
-
-echo "Creating required folders for Hubzilla ..."
-mkdir -p ./store/\[data\]/smarty3
-
-echo "TODO: create .htconfig"
diff --git a/tests/travis/prepare_mysql.sh b/tests/travis/prepare_mysql.sh
deleted file mode 100755
index 5b1c96d78..000000000
--- a/tests/travis/prepare_mysql.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# Copyright (c) 2016 Hubzilla
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-
-# Exit if anything fails
-set -e
-
-echo "Preparing for MySQL/MariaDB ..."
-
-if [[ "$MYSQL_VERSION" == "5.7" ]]; then
-	echo "Using MySQL 5.7 in Docker container, need to use TCP"
-	export PROTO="--protocol=TCP"
-fi
-
-# Print out some MySQL information
-mysql --version
-mysql $PROTO -e "SELECT VERSION();"
-mysql $PROTO -e "SHOW VARIABLES LIKE 'max_allowed_packet';"
-mysql $PROTO -e "SHOW VARIABLES LIKE 'collation_%';"
-mysql $PROTO -e "SHOW VARIABLES LIKE 'character_set%';"
-mysql $PROTO -e "SELECT @@sql_mode;"
-
-# Create Hubzilla database
-mysql $PROTO -u root -e "CREATE DATABASE IF NOT EXISTS travis_hubzilla;";
-mysql $PROTO -u root -e "CREATE USER 'travis_hz'@'%' IDENTIFIED BY 'hubzilla';"
-mysql $PROTO -u root -e "GRANT ALL ON travis_hubzilla.* TO 'travis_hz'@'%';"
-
-# Import table structure
-mysql $PROTO -u root travis_hubzilla < ./install/schema_mysql.sql
-
-# Show databases and tables
-mysql $PROTO -u root -e "SHOW DATABASES;"
-mysql $PROTO -u root -e "USE travis_hubzilla; SHOW TABLES;"
diff --git a/tests/travis/prepare_pgsql.sh b/tests/travis/prepare_pgsql.sh
deleted file mode 100755
index c6b12e4d6..000000000
--- a/tests/travis/prepare_pgsql.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# Copyright (c) 2016 Hubzilla
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-
-# Exit if anything fails
-set -e
-
-echo "Preparing for PostgreSQL ..."
-
-if [[ "$POSTGRESQL_VERSION" == "10" ]]; then
-	echo "Using PostgreSQL in Docker container, need to use TCP"
-	export PROTO="-h localhost"
-fi
-
-# Print out some PostgreSQL information
-psql --version
-# Why does this hang further execution of the job?
-psql $PROTO -U postgres -c "SELECT VERSION();"
-
-# Create Hubzilla database
-psql $PROTO -U postgres -c "DROP DATABASE IF EXISTS travis_hubzilla;"
-psql $PROTO -U postgres -v ON_ERROR_STOP=1 <<-EOSQL
-    CREATE USER travis_hz WITH PASSWORD 'hubzilla';
-    CREATE DATABASE travis_hubzilla;
-    ALTER DATABASE travis_hubzilla OWNER TO travis_hz;
-    GRANT ALL PRIVILEGES ON DATABASE travis_hubzilla TO travis_hz;
-EOSQL
-
-# Import table structure
-psql $PROTO -U travis_hz -v ON_ERROR_STOP=1 travis_hubzilla < ./install/schema_postgres.sql
-
-# Show databases and tables
-psql $PROTO -U postgres -l
-psql $PROTO -U postgres -d travis_hubzilla -c "\dt;"
diff --git a/tests/unit/Access/AccessListTest.php b/tests/unit/Access/AccessListTest.php
deleted file mode 100644
index dbc19fabb..000000000
--- a/tests/unit/Access/AccessListTest.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/*
- * Copyright (c) 2017 Hubzilla
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Zotlabs\Tests\Unit\Access;
-
-use Zotlabs\Tests\Unit\UnitTestCase;
-use Zotlabs\Access\AccessList;
-
-/**
- * @brief Unit Test case for AccessList class.
- *
- * @covers Zotlabs\Access\AccessList
- */
-class AccessListTest extends UnitTestCase {
-
-	/**
-	 * @brief Expected result for most tests.
-	 * @var array
-	 */
-	protected $expectedResult = [
-			'allow_cid' => '<acid><acid2>',
-			'allow_gid' => '<agid>',
-			'deny_cid'  => '',
-			'deny_gid'  => '<dgid><dgid2>'
-	];
-
-
-
-	public function testConstructor() {
-		$channel = [
-				'channel_allow_cid' => '<acid><acid2>',
-				'channel_allow_gid' => '<agid>',
-				'channel_deny_cid' => '',
-				'channel_deny_gid' => '<dgid><dgid2>'
-		];
-
-		$accessList = new AccessList($channel);
-
-		$this->assertEquals($this->expectedResult, $accessList->get());
-		$this->assertFalse($accessList->get_explicit());
-	}
-
-	/**
-	 * @expectedException PHPUnit\Framework\Error\Error
-	 */
-	public function testPHPErrorOnInvalidConstructor() {
-		$accessList = new AccessList('invalid');
-		// Causes: "Illegal string offset 'channel_allow_cid'"
-	}
-
-	public function testDefaultGetExplicit() {
-		$accessList = new AccessList([]);
-
-		$this->assertFalse($accessList->get_explicit());
-	}
-
-	public function testDefaultGet() {
-		$arr = [
-				'allow_cid' => '',
-				'allow_gid' => '',
-				'deny_cid'  => '',
-				'deny_gid'  => ''
-		];
-
-		$accessList = new AccessList([]);
-
-		$this->assertEquals($arr, $accessList->get());
-	}
-
-	public function testSet() {
-		$arr = [
-				'allow_cid' => '<acid><acid2>',
-				'allow_gid' => '<agid>',
-				'deny_cid'  => '',
-				'deny_gid'  => '<dgid><dgid2>'
-		];
-		$accessList = new AccessList([]);
-
-		// default explicit true
-		$accessList->set($arr);
-
-		$this->assertEquals($this->expectedResult, $accessList->get());
-		$this->assertTrue($accessList->get_explicit());
-
-		// set explicit false
-		$accessList->set($arr, false);
-
-		$this->assertEquals($this->expectedResult, $accessList->get());
-		$this->assertFalse($accessList->get_explicit());
-	}
-
-	/**
-	 * @expectedException PHPUnit\Framework\Error\Error
-	 */
-	public function testPHPErrorOnInvalidSet() {
-		$accessList = new AccessList([]);
-
-		$accessList->set('invalid');
-		// Causes: "Illegal string offset 'allow_cid'"
-	}
-
-	/**
-	 * set_from_array() calls some other functions, too which are not yet unit tested.
-	 * @uses ::perms2str
-	 * @uses ::sanitise_acl
-	 * @uses ::notags
-	 */
-	public function testSetFromArray() {
-		// array
-		$arraySetFromArray = [
-				'contact_allow' => ['acid', 'acid2'],
-				'group_allow'   => ['agid'],
-				'contact_deny'  => [],
-				'group_deny'    => ['dgid', 'dgid2']
-		];
-		$accessList = new AccessList([]);
-		$accessList->set_from_array($arraySetFromArray);
-
-		$this->assertEquals($this->expectedResult, $accessList->get());
-		$this->assertTrue($accessList->get_explicit());
-
-
-		// string
-		$stringSetFromArray = [
-				'contact_allow' => 'acid,acid2',
-				'group_allow'   => 'agid',
-				'contact_deny'  => '',
-				'group_deny'    => 'dgid, dgid2'
-		];
-		$accessList2 = new AccessList([]);
-		$accessList2->set_from_array($stringSetFromArray, false);
-
-		$this->assertEquals($this->expectedResult, $accessList2->get());
-		$this->assertFalse($accessList2->get_explicit());
-	}
-
-	/**
-	 * @dataProvider isprivateProvider
-	 */
-	public function testIsPrivate($channel) {
-		$accessListPublic = new AccessList([]);
-		$this->assertFalse($accessListPublic->is_private());
-
-		$accessListPrivate = new AccessList($channel);
-		$this->assertTrue($accessListPrivate->is_private());
-	}
-
-	public function isprivateProvider() {
-		return [
-				'all set' => [[
-						'channel_allow_cid' => '<acid>',
-						'channel_allow_gid' => '<agid>',
-						'channel_deny_cid'  => '<dcid>',
-						'channel_deny_gid'  => '<dgid>'
-				]],
-				'only one set' => [[
-						'channel_allow_cid' => '<acid>',
-						'channel_allow_gid' => '',
-						'channel_deny_cid'  => '',
-						'channel_deny_gid'  => ''
-				]],
-				'acid+null' => [[
-						'channel_allow_cid' => '<acid>',
-						'channel_allow_gid' => null,
-						'channel_deny_cid'  => '',
-						'channel_deny_gid'  => ''
-				]]
-		];
-	}
-
-}
\ No newline at end of file
diff --git a/tests/unit/Access/PermissionLimitsTest.php b/tests/unit/Access/PermissionLimitsTest.php
deleted file mode 100644
index 57ad42a19..000000000
--- a/tests/unit/Access/PermissionLimitsTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/*
- * Copyright (c) 2017 Hubzilla
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Zotlabs\Tests\Unit\Access;
-
-use phpmock\phpunit\PHPMock;
-use Zotlabs\Tests\Unit\UnitTestCase;
-use Zotlabs\Access\PermissionLimits;
-
-/**
- * @brief Unit Test case for PermissionLimits class.
- *
- * @covers Zotlabs\Access\PermissionLimits
- */
-class PermissionLimitsTest extends UnitTestCase {
-
-	use PHPMock;
-
-	/**
-	 * @todo If we could replace static call to Permissions::Perms() in
-	 * Std_Limits() we could better unit test this method, now we test the
-	 * result of Permissions::Perms() mostly.
-	 *
-	 * @uses Zotlabs\Access\Permissions::Perms
-	 * @uses ::call_hooks
-	 */
-	public function testStd_Limits() {
-		// There are 18 default perms
-		$permsCount = 18;
-
-		// Create a stub for global function t() with expectation
-		$t = $this->getFunctionMock('Zotlabs\Access', 't');
-		$t->expects($this->exactly($permsCount));
-
-		$stdlimits = PermissionLimits::Std_Limits();
-		$this->assertCount($permsCount, $stdlimits, "There should be $permsCount permissions.");
-
-		$this->assertEquals(PERMS_PUBLIC,   $stdlimits['view_stream']);
-		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['send_stream']);
-		$this->assertEquals(PERMS_PUBLIC,   $stdlimits['view_profile']);
-		$this->assertEquals(PERMS_PUBLIC,   $stdlimits['view_contacts']);
-		$this->assertEquals(PERMS_PUBLIC,   $stdlimits['view_storage']);
-		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_storage']);
-		$this->assertEquals(PERMS_PUBLIC,   $stdlimits['view_pages']);
-		$this->assertEquals(PERMS_PUBLIC,   $stdlimits['view_wiki']);
-		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_pages']);
-		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_wiki']);
-		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_wall']);
-		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_comments']);
-		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_mail']);
-		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_like']);
-		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['tag_deliver']);
-		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['chat']);
-		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['republish']);
-		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['delegate']);
-	}
-
-}
\ No newline at end of file
diff --git a/tests/unit/Access/PermissionRolesTest.php b/tests/unit/Access/PermissionRolesTest.php
deleted file mode 100644
index 58fd88bb1..000000000
--- a/tests/unit/Access/PermissionRolesTest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/*
- * Copyright (c) 2017 Hubzilla
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Zotlabs\Tests\Unit\Access;
-
-use Zotlabs\Tests\Unit\UnitTestCase;
-use Zotlabs\Access\PermissionRoles;
-use phpmock\phpunit\PHPMock;
-
-/**
- * @brief Unit Test case for PermissionRoles class.
- *
- * @TODO Work around dependencies to static PermissionLimits methods.
- *
- * @covers Zotlabs\Access\PermissionRoles
- */
-class PermissionRolesTest extends UnitTestCase {
-
-	use PHPMock;
-
-	public function testVersion() {
-		$expectedVersion = 2;
-
-		$this->assertEquals($expectedVersion, PermissionRoles::version());
-
-		$pr = new PermissionRoles();
-		$this->assertEquals($expectedVersion, $pr->version());
-	}
-
-
-	public function testRoles() {
-		// Create a stub for global function t() with expectation
-		$t = $this->getFunctionMock('Zotlabs\Access', 't');
-		$t->expects($this->atLeastOnce())->willReturnCallback(
-				function ($string) {
-					return $string;
-				}
-		);
-
-		$roles = PermissionRoles::roles();
-		$r = new PermissionRoles();
-		$this->assertEquals($roles, $r->roles());
-
-		$socialNetworking = [
-				'social_federation' => 'Social - Federation',
-				'social' => 'Social - Mostly Public',
-				'social_restricted' => 'Social - Restricted',
-				'social_private' => 'Social - Private'
-		];
-
-		$this->assertArraySubset(['Social Networking' => $socialNetworking], $roles);
-		$this->assertEquals($socialNetworking, $roles['Social Networking']);
-
-		$this->assertCount(5, $roles, 'There should be 5 permission groups.');
-
-		$this->assertCount(1, $roles['Other'], "In the 'Other' group should be just one permission role");
-	}
-
-
-	/**
-	 * @uses ::call_hooks
-	 * @uses Zotlabs\Access\PermissionLimits::Std_Limits
-	 * @uses Zotlabs\Access\Permissions::Perms
-	 */
-	public function testRole_perms() {
-		// Create a stub for global function t()
-		$t = $this->getFunctionMock('Zotlabs\Access', 't');
-		$t = $this->getFunctionMock('Zotlabs\Access', 'get_config');
-
-		$rp_social = PermissionRoles::role_perms('social');
-		$this->assertEquals('social', $rp_social['role']);
-
-
-		$rp_custom = PermissionRoles::role_perms('custom');
-		$this->assertEquals(['role' => 'custom'], $rp_custom);
-
-		$rp_nonexistent = PermissionRoles::role_perms('nonexistent');
-		$this->assertEquals(['role' => 'nonexistent'], $rp_nonexistent);
-	}
-
-}
diff --git a/tests/unit/Access/PermissionsTest.php b/tests/unit/Access/PermissionsTest.php
deleted file mode 100644
index 40724fff8..000000000
--- a/tests/unit/Access/PermissionsTest.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-/*
- * Copyright (c) 2017 Hubzilla
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Zotlabs\Tests\Unit\Access;
-
-use phpmock\phpunit\PHPMock;
-use Zotlabs\Tests\Unit\UnitTestCase;
-use Zotlabs\Access\Permissions;
-
-/**
- * @brief Unit Test case for Permissions class.
- *
- * @covers Zotlabs\Access\Permissions
- */
-class PermissionsTest extends UnitTestCase {
-
-	use PHPMock;
-
-	public function testVersion() {
-		$expectedVersion = 2;
-
-		// static call
-		$this->assertEquals($expectedVersion, Permissions::version());
-
-		// instance call
-		$p = new Permissions();
-		$this->assertEquals($expectedVersion, $p->version());
-	}
-
-	/**
-	 * @coversNothing
-	 */
-	public function testVersionEqualsPermissionRoles() {
-		$p = new Permissions();
-		$pr = new \Zotlabs\Access\PermissionRoles();
-		$this->assertEquals($p->version(), $pr->version());
-	}
-
-	/**
-	 * @uses ::call_hooks
-	 */
-	public function testPerms() {
-		// There are 18 default perms
-		$permsCount = 18;
-
-		// Create a stub for global function t() with expectation
-		$t = $this->getFunctionMock('Zotlabs\Access', 't');
-		$t->expects($this->exactly(2*$permsCount))->willReturnCallback(
-				function ($string) {
-					return $string;
-				}
-		);
-
-		// static method Perms()
-		$perms = Permissions::Perms();
-
-		$p = new Permissions();
-		$this->assertEquals($perms, $p->Perms());
-
-		$this->assertEquals($permsCount, count($perms), "There should be $permsCount permissions.");
-
-		$this->assertEquals('Can view my channel stream and posts', $perms['view_stream']);
-
-		// non existent perm should not be set
-		$this->assertFalse(isset($perms['invalid_perm']));
-	}
-
-	/**
-	 * filter parmeter is only used in hook \b permissions_list. So the result
-	 * in this test should be the same as if there was no filter parameter.
-	 *
-	 * @todo Stub call_hooks() function and also test filter
-	 *
-	 * @uses ::call_hooks
-	 */
-	public function testPermsFilter() {
-		// There are 18 default perms
-		$permsCount = 18;
-
-		// Create a stub for global function t() with expectation
-		$t = $this->getFunctionMock('Zotlabs\Access', 't');
-		$t->expects($this->exactly(2*$permsCount))->willReturnCallback(
-				function ($string) {
-					return $string;
-				}
-		);
-
-		$perms = Permissions::Perms('view_');
-		$this->assertEquals($permsCount, count($perms));
-
-		$this->assertEquals('Can view my channel stream and posts', $perms['view_stream']);
-
-		$perms = Permissions::Perms('invalid_perm');
-		$this->assertEquals($permsCount, count($perms));
-	}
-
-	/**
-	 * Better should mock Permissions::Perms, but not possible with static methods.
-	 *
-	 * @uses ::call_hooks
-	 *
-	 * @dataProvider FilledPermsProvider
-	 *
-	 * @param array $permarr An indexed permissions array to pass
-	 * @param array $expected The expected result perms array
-	 */
-	public function testFilledPerms($permarr, $expected) {
-		// Create a stub for global function t()
-		$t = $this->getFunctionMock('Zotlabs\Access', 't');
-
-		$this->assertEquals($expected, Permissions::FilledPerms($permarr));
-	}
-	/**
-	 * @return array An associative array with test values for FilledPerms()
-	 *   * \e array Indexed array which is passed as parameter to FilledPerms()
-	 *   * \e array Expected associative result array with filled perms
-	 */
-	public function FilledPermsProvider() {
-		return [
-				'Empty param array' => [
-						[],
-						[
-								'view_stream' => 0,
-								'send_stream' => 0,
-								'view_profile' => 0,
-								'view_contacts' => 0,
-								'view_storage' => 0,
-								'write_storage' => 0,
-								'view_pages' => 0,
-								'view_wiki' => 0,
-								'write_pages' => 0,
-								'write_wiki' => 0,
-								'post_wall' => 0,
-								'post_comments' => 0,
-								'post_mail' => 0,
-								'post_like' => 0,
-								'tag_deliver' => 0,
-								'chat' => 0,
-								'republish' => 0,
-								'delegate' => 0
-						]
-				],
-				'provide view_stream and view_pages as param' => [
-						['view_stream', 'view_pages'],
-						[
-								'view_stream' => 1,
-								'send_stream' => 0,
-								'view_profile' => 0,
-								'view_contacts' => 0,
-								'view_storage' => 0,
-								'write_storage' => 0,
-								'view_pages' => 1,
-								'view_wiki' => 0,
-								'write_pages' => 0,
-								'write_wiki' => 0,
-								'post_wall' => 0,
-								'post_comments' => 0,
-								'post_mail' => 0,
-								'post_like' => 0,
-								'tag_deliver' => 0,
-								'chat' => 0,
-								'republish' => 0,
-								'delegate' => 0
-						]
-				],
-				'provide an unknown param' => [
-						['view_stream', 'unknown_perm'],
-						[
-								'view_stream' => 1,
-								'send_stream' => 0,
-								'view_profile' => 0,
-								'view_contacts' => 0,
-								'view_storage' => 0,
-								'write_storage' => 0,
-								'view_pages' => 0,
-								'view_wiki' => 0,
-								'write_pages' => 0,
-								'write_wiki' => 0,
-								'post_wall' => 0,
-								'post_comments' => 0,
-								'post_mail' => 0,
-								'post_like' => 0,
-								'tag_deliver' => 0,
-								'chat' => 0,
-								'republish' => 0,
-								'delegate' => 0
-						]
-				]
-		];
-	}
-	/**
-	 * @uses ::call_hooks
-	 */
-	public function testFilledPermsNull() {
-		// Create a stub for global function t() with expectation
-		$t = $this->getFunctionMock('Zotlabs\Access', 't');
-		$t->expects($this->atLeastOnce());
-		// Create a stub for global function bt() with expectations
-		$bt = $this->getFunctionMock('Zotlabs\Access', 'btlogger');
-		$bt->expects($this->once())->with($this->equalTo('FilledPerms: null'));
-
-		$result = [
-				'view_stream' => 0,
-				'send_stream' => 0,
-				'view_profile' => 0,
-				'view_contacts' => 0,
-				'view_storage' => 0,
-				'write_storage' => 0,
-				'view_pages' => 0,
-				'view_wiki' => 0,
-				'write_pages' => 0,
-				'write_wiki' => 0,
-				'post_wall' => 0,
-				'post_comments' => 0,
-				'post_mail' => 0,
-				'post_like' => 0,
-				'tag_deliver' => 0,
-				'chat' => 0,
-				'republish' => 0,
-				'delegate' => 0
-		];
-
-		$this->assertEquals($result, Permissions::FilledPerms(null));
-	}
-
-	/**
-	 * @dataProvider OPermsProvider
-	 *
-	 * @param array $permarr The params to pass to the OPerms method
-	 * @param array $expected The expected result
-	 */
-	public function testOPerms($permarr, $expected) {
-		$this->assertEquals($expected, Permissions::OPerms($permarr));
-	}
-	/**
-	 * @return array An associative array with test values for OPerms()
-	 *   * \e array Array with perms to test
-	 *   * \e array Expected result array
-	 */
-	public function OPermsProvider() {
-		return [
-				'empty' => [
-						[],
-						[]
-				],
-				'valid' => [
-						['perm1' => 1, 'perm2' => 0],
-						[['name' => 'perm1', 'value' => 1], ['name' => 'perm2', 'value' => 0]]
-				],
-				'null array' => [
-						null,
-						[]
-				]
-		];
-	}
-
-	/**
-	 * @dataProvider permsCompareProvider
-	 *
-	 * @param array $p1 The first permission
-	 * @param array $p2 The second permission
-	 * @param boolean $expectedresult The expected result of the tested method
-	 */
-	public function testPermsCompare($p1, $p2, $expectedresult) {
-		$this->assertEquals($expectedresult, Permissions::PermsCompare($p1, $p2));
-	}
-	/**
-	 * @return array An associative array with test values for PermsCompare()
-	 *   * \e array 1st array with perms
-	 *   * \e array 2nd array with perms
-	 *   * \e boolean expected result for the perms comparison
-	 */
-	public function permsCompareProvider() {
-		return [
-				'equal' => [
-						['perm1' => 1, 'perm2' => 0],
-						['perm1' => 1, 'perm2' => 0],
-						true
-				],
-				'different values' => [
-						['perm1' => 1, 'perm2' => 0],
-						['perm1' => 0, 'perm2' => 1],
-						false
-				],
-				'different order' => [
-						['perm1' => 1, 'perm2' => 0],
-						['perm2' => 0, 'perm1' => 1],
-						true
-				],
-				'partial first in second' => [
-						['perm1' => 1],
-						['perm1' => 1, 'perm2' => 0],
-						true
-				],
-				'partial second in first' => [
-						['perm1' => 1, 'perm2' => 0],
-						['perm1' => 1],
-						false
-				]
-		];
-	}
-}
diff --git a/tests/unit/AntiXSSTest.php b/tests/unit/AntiXSSTest.php
deleted file mode 100644
index b45042a1e..000000000
--- a/tests/unit/AntiXSSTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * tests several functions which are used to prevent xss attacks
- *
- * @package test.util
- */
-
-use PHPUnit\Framework\TestCase;
-
-require_once('include/text.php');
-
-class AntiXSSTest extends TestCase {
-
-	/**
-	 * test, that tags are escaped
-	 */
-	public function testEscapeTags() {
-		$invalidstring='<submit type="button" onclick="alert(\'failed!\');" />';
-
-		$validstring=notags($invalidstring);
-		$escapedString=escape_tags($invalidstring);
-
-		$this->assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring);
-		$this->assertEquals("&lt;submit type=&quot;button&quot; onclick=&quot;alert('failed!');&quot; /&gt;", $escapedString);
-	}
-
-	/**
-	 *xmlify and unxmlify
-	 */
-	public function testXmlify() {
-		$text="<tag>I want to break\n this!11!<?hard?></tag>";
-		$xml=xmlify($text);
-		$retext=unxmlify($text);
-
-		$this->assertEquals($text, $retext);
-	}
-
-	/**
-	 * xmlify and put in a document
-	 */
-	public function testXmlifyDocument() {
-		$tag="<tag>I want to break</tag>";
-		$xml=xmlify($tag);
-		$text='<text>'.$xml.'</text>';
-
-		$xml_parser=xml_parser_create();
-		//should be possible to parse it
-		$values=array(); $index=array();
-		$this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index));
-
-		$this->assertEquals(array('TEXT'=>array(0)),
-				$index);
-		$this->assertEquals(array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)),
-				$values);
-
-		xml_parser_free($xml_parser);
-	}
-
-	/**
-	 * test hex2bin and reverse
-	 */
-	public function testHex2Bin() {
-		$this->assertEquals(-3, hex2bin(bin2hex(-3)));
-		$this->assertEquals(0, hex2bin(bin2hex(0)));
-		$this->assertEquals(12, hex2bin(bin2hex(12)));
-		$this->assertEquals(PHP_INT_MAX, hex2bin(bin2hex(PHP_INT_MAX)));
-	}
-
-	//function qp, quick and dirty??
-	//get_mentions
-	//get_contact_block, bis Zeile 538
-}
-?>
diff --git a/tests/unit/AutonameTest.php b/tests/unit/AutonameTest.php
deleted file mode 100644
index 566fe6149..000000000
--- a/tests/unit/AutonameTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * this file contains tests for the autoname function
- *
- * @package test.util
- */
-
-use PHPUnit\Framework\TestCase;
-
-/** required, it is the file under test */
-require_once('include/text.php');
-
-/**
- * TestCase for the autoname function
- *
- * @author Alexander Kampmann
- * @package test.util
- */
-class AutonameTest extends TestCase {
-	/**
-	 *autonames should be random, even length
-	 */
-	public function testAutonameEven() {
-		$autoname1=autoname(10);
-		$autoname2=autoname(10);
-
-		$this->assertNotEquals($autoname1, $autoname2);
-	}
-
-	/**
-	 *autonames should be random, odd length
-	 */
-	public function testAutonameOdd() {
-		$autoname1=autoname(9);
-		$autoname2=autoname(9);
-
-		$this->assertNotEquals($autoname1, $autoname2);
-	}
-
-	/**
-	 * try to fail autonames
-	 */
-	public function testAutonameNoLength() {
-		$autoname1=autoname(0);
-		$this->assertEquals(0, strlen($autoname1));
-	}
-
-	/**
-	 * try to fail it with invalid input
-	 *
-	 * TODO: What's corect behaviour here? An exception?
-	 */
-	public function testAutonameNegativeLength() {
-		$autoname1=autoname(-23);
-		$this->assertEquals(0, strlen($autoname1));
-	}
-
-	// 	public function testAutonameMaxLength() {
-	// 		$autoname2=autoname(PHP_INT_MAX);
-	// 		$this->assertEquals(PHP_INT_MAX, strlen($autoname2));
-	// 	}
-
-	/**
-	 * test with a length, that may be too short
-	 * length is maximum - autoname can return something shorter.
-	 */
-	public function testAutonameLength1() {
-		$autoname1=autoname(1);
-		$test = ((strlen($autoname1) < 2) ? 1 : 0);
-		$this->assertEquals(1, $test);
-
-		$autoname2=autoname(1);
-		$test = ((strlen($autoname2) < 2) ? 1 : 0);
-		$this->assertEquals(1, $test);
-
-		// The following test is problematic, with only 26 possibilities
-		// generating the same thing twice happens often aka
-		// birthday paradox
-//		$this->assertFalse($autoname1==$autoname2);
-	}
-}
diff --git a/tests/unit/ContainsAttributeTest.php b/tests/unit/ContainsAttributeTest.php
deleted file mode 100644
index 0930d9837..000000000
--- a/tests/unit/ContainsAttributeTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * this test tests the contains_attribute function
- *
- * @package test.util
- */
-
-use PHPUnit\Framework\TestCase;
-
-/** required, it is the file under test */
-require_once('include/text.php');
-
-/**
- * TestCase for the contains_attribute function
- *
- * @author Alexander Kampmann
- * @package test.util
- */
-class ContainsAttributeTest extends TestCase {
-	/**
-	 * test attribute contains
-	 */
-	public function testAttributeContains1() {
-		$testAttr="class1 notclass2 class3";
-		$this->assertTrue(attribute_contains($testAttr, "class3"));
-		$this->assertFalse(attribute_contains($testAttr, "class2"));
-	}
-
-	/**
-	 * test attribute contains
-	 */
-	public function testAttributeContains2() {
-		$testAttr="class1 not-class2 class3";
-		$this->assertTrue(attribute_contains($testAttr, "class3"));
-		$this->assertFalse(attribute_contains($testAttr, "class2"));
-	}
-
-	/**
-	 * test with empty input
-	 */
-	public function testAttributeContainsEmpty() {
-		$testAttr="";
-		$this->assertFalse(attribute_contains($testAttr, "class2"));
-	}
-
-	/**
-	 * test input with special chars
-	 */
-	public function testAttributeContainsSpecialChars() {
-		$testAttr="--... %\$ä() /(=?}";
-		$this->assertFalse(attribute_contains($testAttr, "class2"));
-	}
-}
\ No newline at end of file
diff --git a/tests/unit/DatabaseTestCase.php b/tests/unit/DatabaseTestCase.php
deleted file mode 100644
index 18c1cfb17..000000000
--- a/tests/unit/DatabaseTestCase.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/* Copyright (c) 2017 Hubzilla
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Zotlabs\Tests\Unit;
-
-use PHPUnit\DbUnit\TestCaseTrait;
-use PHPUnit\Framework\TestCase;
-
-/**
- * @brief Base class for our Database Unit Tests.
- *
- * @warning Never run these tests against a production database, because all
- * tables will get truncated and there is no way to recover without a backup.
- *
- * @author Klaus Weidenbach
- */
-abstract class DatabaseTestCase extends TestCase {
-
-	use TestCaseTrait;
-
-	/**
-	 * Only instantiate PDO once for test clean-up/fixture load.
-	 *
-	 * @var \PDO
-	 */
-	static private $pdo = null;
-
-	/**
-	 * Only instantiate \PHPUnit\DbUnit\Database\Connection once per test.
-	 *
-	 * @var \PHPUnit\DbUnit\Database\Connection
-	 */
-	private $conn = null;
-
-
-	final public function getConnection() {
-		if ($this->conn === null) {
-			if (self::$pdo === null) {
-				$dsn = \getenv('hz_db_scheme') . ':host=' . \getenv('hz_db_server')
-					. ';port=' . \getenv('hz_db_port') . ';dbname=' . \getenv('hz_db_database');
-
-				self::$pdo = new \PDO($dsn, \getenv('hz_db_user'), \getenv('hz_db_pass'));
-			}
-			$this->conn = $this->createDefaultDBConnection(self::$pdo, \getenv('hz_db_database'));
-		}
-
-		return $this->conn;
-	}
-}
diff --git a/tests/unit/Lib/PermissionDescriptionTest.php b/tests/unit/Lib/PermissionDescriptionTest.php
deleted file mode 100644
index 96c381d0c..000000000
--- a/tests/unit/Lib/PermissionDescriptionTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/*
- * Copyright (c) 2016-2017 Hubzilla
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Zotlabs\Tests\Unit\Lib;
-
-use phpmock\phpunit\PHPMock;
-use Zotlabs\Tests\Unit\UnitTestCase;
-use Zotlabs\Lib\PermissionDescription;
-
-/**
- * @brief Unit Test case for PermissionDescription class.
- *
- * @covers Zotlabs\Lib\PermissionDescription
- */
-class PermissionDescriptionTest extends UnitTestCase {
-
-	use PHPMock;
-
-	public function testFromDescription() {
-		$permDesc = PermissionDescription::fromDescription('test');
-		$permDesc2 = PermissionDescription::fromDescription('test');
-		$permDesc3 = PermissionDescription::fromDescription('test2');
-
-		$this->assertEquals($permDesc, $permDesc2);
-		$this->assertNotEquals($permDesc, $permDesc3);
-	}
-
-	public function testFromStandalonePermission() {
-		// Create a stub for global function t()
-		$t = $this->getFunctionMock('Zotlabs\Lib', 't');
-		$t->expects($this->atLeastOnce())->willReturnCallback(
-			function ($string) {
-				return $string;
-			}
-		);
-		// Create a mock for global function logger()
-		$this->getFunctionMock('Zotlabs\Lib', 'logger');
-
-		$permDescUnknown = PermissionDescription::fromStandalonePermission(-1);
-		$permDescSelf = PermissionDescription::fromStandalonePermission(0);
-
-		$this->assertNull($permDescUnknown);
-		$this->assertNotNull($permDescSelf);
-	}
-
-	public function testFromGlobalPermission() {
-		//$permDesc = PermissionDescription::fromGlobalPermission('view_profile');
-
-		$this->markTestIncomplete(
-			'The method fromGlobalPermission() is not yet testable ...'
-		);
-	}
-
-	public function testGetPermissionDescription() {
-		// Create a stub for global function t()
-		$t = $this->getFunctionMock('Zotlabs\Lib', 't');
-		$t->expects($this->atLeastOnce())->willReturnCallback(
-				function ($string) {
-					return $string;
-				}
-		);
-		// Create a mock for global function logger()
-		$this->getFunctionMock('Zotlabs\Lib', 'logger');
-
-		// Create a stub for the PermissionDescription class
-		$stub = $this->createMock(PermissionDescription::class);
-		$stub->method('get_permission_description')
-			->will($this->returnArgument(0));
-
-		$permDescSelf = PermissionDescription::fromStandalonePermission(0);
-		$this->assertInstanceOf(PermissionDescription::class, $permDescSelf);
-		$this->assertEquals($permDescSelf->get_permission_description(), 'Only me');
-
-		$permDescPublic = PermissionDescription::fromStandalonePermission(PERMS_PUBLIC);
-		$this->assertEquals($permDescPublic->get_permission_description(), 'Public');
-	}
-}
diff --git a/tests/unit/Photo/PhotoGdTest.php b/tests/unit/Photo/PhotoGdTest.php
deleted file mode 100644
index ae7382c43..000000000
--- a/tests/unit/Photo/PhotoGdTest.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-namespace Zotlabs\Tests\Unit\Photo;
-
-use Zotlabs\Photo\PhotoGd;
-use phpmock\phpunit\PHPMock;
-use Zotlabs\Tests\Unit\UnitTestCase;
-
-/**
- * @brief PhotoGd test case.
- *
- * These tests are not really useful yet, just some obvious behaviour.
- *
- * @todo Compare the actual results.
- * @todo Test different image types.
- */
-class PhotoGdTest extends UnitTestCase {
-
-	use PHPMock;
-
-	/**
-	 * @var PhotoGd
-	 */
-	private $photoGd;
-
-	/**
-	 * Prepares the environment before running a test.
-	 */
-	protected function setUp(): void {
-		parent::setUp();
-
-		$data = file_get_contents('images/hz-16.png');
-
-		$this->photoGd = new PhotoGd($data, 'image/png');
-	}
-
-	/**
-	 * Cleans up the environment after running a test.
-	 */
-	protected function tearDown(): void {
-		$this->photoGd = null;
-
-		parent::tearDown();
-	}
-
-	/**
-	 * Tests PhotoGd->supportedTypes()
-	 *
-	 * Without mocking gd this check is environment dependent.
-	 *
-	public function testSupportedTypes() {
-		$sft = $this->photoGd->supportedTypes();
-
-		$this->assertArrayHasKey('image/jpeg', $sft);
-		$this->assertArrayHasKey('image/gif', $sft);
-		$this->assertArrayHasKey('image/png', $sft);
-
-		$this->assertArrayNotHasKey('image/foo', $sft);
-	}
-	*/
-
-	/**
-	 * Tests PhotoGd->clearexif()
-	 */
-	public function testClearexifIsNotImplementedInGdAndDoesNotAlterImageOrReturnSomething() {
-		$data_before = $this->photoGd->getImage();
-		$this->assertNull($this->photoGd->clearexif());
-		$this->assertSame($data_before, $this->photoGd->getImage());
-	}
-
-	/**
-	 * Tests PhotoGd->getImage()
-	 */
-	public function testGetimageReturnsAResource() {
-		$res = $this->photoGd->getImage();
-		$this->assertIsResource($res);
-		$this->assertEquals('gd', get_resource_type($res));
-	}
-	public function testGetimageReturnsFalseOnFailure() {
-		$this->photoGd = new PhotoGd('');
-		$this->assertFalse($this->photoGd->getImage());
-	}
-
-	/**
-	 * Tests PhotoGd->doScaleImage()
-	 */
-	public function testDoscaleImageSetsCorrectDimensions() {
-		$this->photoGd->doScaleImage(5, 8);
-
-		$this->assertSame(5, $this->photoGd->getWidth());
-		$this->assertSame(8, $this->photoGd->getHeight());
-	}
-
-	/**
-	 * Tests PhotoGd->rotate()
-	 */
-	public function testRotate360DegreesCreatesANewImage() {
-		$data = $this->photoGd->getImage();
-		$this->photoGd->rotate(360);
-		$this->assertNotEquals($data, $this->photoGd->getImage());
-	}
-
-	/**
-	 * Tests PhotoGd->flip()
-	 *
-	public function testFlip() {
-		// TODO Auto-generated PhotoGdTest->testFlip()
-		$this->markTestIncomplete("flip test not implemented");
-
-		$this->photoGd->flip();
-	}
-	*/
-
-	/**
-	 * Tests PhotoGd->cropImageRect()
-	 */
-	public function testCropimagerectSetsCorrectDimensions() {
-		$this->photoGd->cropImageRect(10, 12, 1, 2, 11, 11);
-
-		$this->assertSame(10, $this->photoGd->getWidth());
-		$this->assertSame(12, $this->photoGd->getHeight());
-	}
-
-	/**
-	 * Tests PhotoGd->imageString()
-	 */
-	public function testImagestringReturnsABinaryString() {
-		// Create a stub for global function get_config()
-		// get_config('system', 'png_quality')
-		// get_config('system', 'jpeg_quality');
-		$gc = $this->getFunctionMock('Zotlabs\Photo', 'get_config');
-		$gc->expects($this->once())->willReturnCallback(
-				function() {
-					switch($this->photoGd->getType()){
-						case 'image/png':
-							return 7;
-						case 'image/jpeg':
-						default:
-							return 70;
-					}
-				}
-		);
-
-		$this->assertIsString($this->photoGd->imageString());
-	}
-
-}
diff --git a/tests/unit/UnitTestCase.php b/tests/unit/UnitTestCase.php
deleted file mode 100644
index 7d706d5be..000000000
--- a/tests/unit/UnitTestCase.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/* Copyright (c) 2016 Hubzilla
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Zotlabs\Tests\Unit;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * @brief Base class for our Unit Tests.
- *
- * Empty class at the moment, but you should extend this class for unit test
- * cases, so we could and for sure we will need to implement basic behaviour
- * for all of our unit tests.
- *
- * @author Klaus Weidenbach
- */
-abstract class UnitTestCase extends TestCase {
-	// when needed we can define functionality here which is used in UnitTests.
-}
diff --git a/tests/unit/UploadTest.php b/tests/unit/UploadTest.php
deleted file mode 100644
index ab9d0e50a..000000000
--- a/tests/unit/UploadTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * this file contains tests for the uploader
- *
- * @package test.util
- */
-
-use PHPUnit\Framework\TestCase;
-
-/** required, it is the file under test */
-require_once('include/attach.php');
-
-/**
- * TestCase for the uploader
- *
- * @author ken restivo
- * @package test.util
- */
-class UploadTest extends TestCase {
-	public function testFileNameMutipleDots() {
-		$multidots = "foo.bar.baz.0.1.3.ogg";
-		$this->assertEquals("audio/ogg", z_mime_content_type($multidots));
-		$this->assertNotEquals("application/octet-stream", z_mime_content_type($multidots));
-	}
-
-	public function testFileNameOneDot() {
-		$multidots = "foo.ogg";
-		$this->assertEquals("audio/ogg", z_mime_content_type($multidots));
-		$this->assertNotEquals("application/octet-stream", z_mime_content_type($multidots));
-	}
-}
\ No newline at end of file
diff --git a/tests/unit/Web/HttpSigTest.php b/tests/unit/Web/HttpSigTest.php
deleted file mode 100644
index db0f9700f..000000000
--- a/tests/unit/Web/HttpSigTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/*
- * Copyright (c) 2018 Hubzilla
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Zotlabs\Tests\Unit\Web;
-
-use phpmock\phpunit\PHPMock;
-use Zotlabs\Tests\Unit\UnitTestCase;
-
-use Zotlabs\Web\HTTPSig;
-
-/**
- * @brief Unit Test case for HTTPSig class.
- *
- * @covers Zotlabs\Web\HTTPSig
- */
-class PermissionDescriptionTest extends UnitTestCase {
-
-	use PHPMock;
-
-	/**
-	 * @dataProvider generate_digestProvider
-	 */
-	function testGenerate_digest($text, $digest) {
-		$this->assertSame(
-				$digest,
-				HTTPSig::generate_digest_header($text)
-		);
-	}
-	public function generate_digestProvider() {
-		return [
-				'empty body text' => [
-						'',
-						'SHA-256=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='
-				],
-				'sample body text' => [
-						'body text',
-						'SHA-256=2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI='
-				],
-				'NULL body text' => [
-						null,
-						'SHA-256=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='
-				],
-		];
-	}
-
-	function testGeneratedDigestsOfDifferentTextShouldNotBeEqual() {
-		$this->assertNotSame(
-				HTTPSig::generate_digest_header('text1'),
-				HTTPSig::generate_digest_header('text2')
-		);
-	}
-
-	/**
-	 * @uses ::crypto_unencapsulate
-	 */
-	function testDecrypt_sigheader() {
-		$header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"';
-		$result = [
-				'encrypted' => true,
-				'iv' => 'value_iv',
-				'key' => 'value_key',
-				'alg' => 'value_alg',
-				'data' => 'value_data'
-		];
-
-		$this->assertSame($result, HTTPSig::decrypt_sigheader($header, 'site private key'));
-	}
-	/**
-	 * @uses ::crypto_unencapsulate
-	 */
-	function testDecrypt_sigheaderUseSitePrivateKey() {
-		// Create a stub for global function get_config() with expectation
-		$t = $this->getFunctionMock('Zotlabs\Web', 'get_config');
-		$t->expects($this->once())->willReturn('system.prvkey');
-
-		$header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"';
-		$result = [
-				'encrypted' => true, 
-				'iv' => 'value_iv',
-				'key' => 'value_key',
-				'alg' => 'value_alg',
-				'data' => 'value_data'
-		];
-
-		$this->assertSame($result, HTTPSig::decrypt_sigheader($header));
-	}
-	function testDecrypt_sigheaderIncompleteHeaderShouldReturnEmptyString() {
-		$header = 'Header: iv="value_iv" key="value_key"';
-
-		$this->assertEmpty(HTTPSig::decrypt_sigheader($header, 'site private key'));
-	}
-}
diff --git a/tests/unit/expand_acl_test.php b/tests/unit/expand_acl_test.php
deleted file mode 100644
index 154bc921d..000000000
--- a/tests/unit/expand_acl_test.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * this test tests the expand_acl function
- *
- * @package test.util
- */
-
-/** required, it is the file under test */
-require_once('include/text.php');
-
-/**

- * TestCase for the expand_acl function

- *

- * @author Alexander Kampmann

- * @package test.util

- */

-class ExpandAclTest extends PHPUnit_Framework_TestCase {
-	
-	/**

-	 * test expand_acl, perfect input

-	 */

-	public function testExpandAclNormal() {

-		$text='<1><2><3>';

-		$this->assertEquals(array(1, 2, 3), expand_acl($text));

-	}

-	
-	/**
-	 * test with a big number
-	 */

-	public function testExpandAclBigNumber() {

-		$text='<1><'.PHP_INT_MAX.'><15>';

-		$this->assertEquals(array(1, PHP_INT_MAX, 15), expand_acl($text));

-	}

-	
-	/**
-	 * test with a string in it. 
-	 * 
-	 * TODO: is this valid input? Otherwise: should there be an exception?
-	 */

-	public function testExpandAclString() {

-		$text="<1><279012><tt>"; 

-		$this->assertEquals(array(1, 279012), expand_acl($text));

-	}

-	
-	/**
-	 * test with a ' ' in it. 
-	 * 
-	 * TODO: is this valid input? Otherwise: should there be an exception?
-	 */

-	public function testExpandAclSpace() {

-		$text="<1><279 012><32>"; 

-		$this->assertEquals(array(1, "279", "32"), expand_acl($text));

-	}

-	
-	/**
-	 * test empty input
-	 */

-	public function testExpandAclEmpty() {

-		$text=""; 

-		$this->assertEquals(array(), expand_acl($text));

-	}

-	
-	/**
-	 * test invalid input, no < at all
-	 * 
-	 * TODO: should there be an exception?
-	 */

-	public function testExpandAclNoBrackets() {

-		$text="According to documentation, that's invalid. "; //should be invalid

-		$this->assertEquals(array(), expand_acl($text));

-	}

-	
-	/**

-	 * test invalid input, just open <

-	 *

-	 * TODO: should there be an exception?

-	 */

-	public function testExpandAclJustOneBracket1() {

-		$text="<Another invalid string"; //should be invalid

-		$this->assertEquals(array(), expand_acl($text));

-	}

-	
-	/**

-	 * test invalid input, just close >

-	 *

-	 * TODO: should there be an exception?

-	 */

-	public function testExpandAclJustOneBracket2() {

-		$text="Another invalid> string"; //should be invalid

-		$this->assertEquals(array(), expand_acl($text));

-	}

-	
-	/**

-	 * test invalid input, just close >

-	 *

-	 * TODO: should there be an exception?

-	 */

-	public function testExpandAclCloseOnly() {

-		$text="Another> invalid> string>"; //should be invalid

-		$this->assertEquals(array(), expand_acl($text));

-	}

-	
-	/**

-	 * test invalid input, just open <

-	 *

-	 * TODO: should there be an exception?

-	 */

-	public function testExpandAclOpenOnly() {

-		$text="<Another< invalid string<"; //should be invalid

-		$this->assertEquals(array(), expand_acl($text));

-	}

-	
-	/**

-	 * test invalid input, open and close do not match

-	 *

-	 * TODO: should there be an exception?

-	 */

-	public function testExpandAclNoMatching1() {

-		$text="<Another<> invalid <string>"; //should be invalid

-		$this->assertEquals(array(), expand_acl($text));

-	}

-	
-	/**

-	 * test invalid input, open and close do not match

-	 *

-	 * TODO: should there be an exception?

-	 */

-	public function testExpandAclNoMatching2() {

-		$text="<1>2><3>";

-// The angles are delimiters which aren't important
-// the important thing is the numeric content, this returns array(1,2,3) currently
-// we may wish to eliminate 2 from the results, though it isn't harmful
-// It would be a better test to figure out if there is any ACL input which can
-// produce this $text and fix that instead.
-//		$this->assertEquals(array(), expand_acl($text));

-	}
-	
-	/**

-	 * test invalid input, empty <>

-	 *

-	 * TODO: should there be an exception? Or array(1, 3)

-	 * (This should be array(1,3) - mike)
-	 */

-	public function testExpandAclEmptyMatch() {

-		$text="<1><><3>";

-		$this->assertEquals(array(1,3), expand_acl($text));

-	}
-}
\ No newline at end of file
diff --git a/tests/unit/get_tags_test.php b/tests/unit/get_tags_test.php
deleted file mode 100644
index bdffd8311..000000000
--- a/tests/unit/get_tags_test.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-/**
- * This file contains the tests for get_tags and the tag handling in item.php
- * 
- * @package test.util
- */
-
-/**
- * required, because it contains the get_tags() function
- */
-require_once 'include/text.php';
-/**
- * required, because it contains the tag handling
- */
-require_once 'mod/item.php';
-
-/**
- * A class which can be used as replacement for an app if
- * only get_baseurl is used. 
- * 
- * @author Alexander Kampmann
- * @package test.util
- */
-class MockApp {
-	function get_baseurl() {
-		return "baseurl"; 
-	}
-}; 
-
-/**
- * the test should not rely on a database, 
- * so this is a replacement for the database access method q. 
- * 
- * It simulates the user with uid 11 has one contact, named Mike Lastname. 
- * 
- * @param string $sql
- */
-function q($sql) {
-	$result=array(array('id'=>15, 
-			'attag'=>'', 'network'=>'dfrn', 
-			'name'=>'Mike Lastname', 'alias'=>'Mike', 
-			'nick'=>'Mike', 'url'=>"http://justatest.de")); 
-	
-	$args=func_get_args(); 
-
-	//last parameter is always (in this test) uid, so, it should be 11
-	if($args[count($args)-1]!=11) {
-		return; 
-	}
-	
-	
-	if(3==count($args)) {
-		//first call in handle_body, id only
-		if($result[0]['id']==$args[1]) {
-			return $result; 
-		}
-		//second call in handle_body, name
-		if($result[0]['name']===$args[1]) {

-			return $result;

-		}
-	}
-	//third call in handle_body, nick or attag
-	if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) {

-		return $result;

-	}
-}
-
-/**
- * replacement for dbesc. 
- * I don't want to test dbesc here, so
- * I just return the input. It won't be a problem, because 
- * the test does not use a real database. 
- * 
- * DON'T USE HAT FUNCTION OUTSIDE A TEST!
- * 
- * @param string $str
- * @return input
- */
-function dbesc($str) {
-	return $str; 
-}
-
-/**
- * TestCase for tag handling. 
- * 
- * @author alexander
- * @package test.util
- */
-class GetTagsTest extends PHPUnit_Framework_TestCase {
-	/** the mock to use as app */
-	private $a; 

-
-	/**
-	 * initialize the test. That's a phpUnit function, 
-	 * don't change its name.
-	 */

-	public function setUp() {

-		$this->a=new MockApp(); 
-	}
-
-	/**

-	 * test with one Person tag

-	 */

-	public function testGetTagsShortPerson() {

-		$text="hi @Mike";

-

-		$tags=get_tags($text);

-
-		$str_tags='';
-		foreach($tags as $tag) {
-			handle_tag($text, $str_tags, 11, $tag);
-		}
-
-		//correct tags found?
-		$this->assertEquals(1, count($tags)); 

-		$this->assertTrue(in_array("@Mike", $tags));
-		
-		//correct output from handle_tag?
-		$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
-		$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url]", $text);

-	}
-	
-	/**

-	 * test with one Person tag. 
-	 * There's a minor spelling mistake...

-	 */

-	public function testGetTagsShortPersonSpelling() {

-		$text="hi @Mike.because";

-	

-		$tags=get_tags($text);

-	
-		//correct tags found?

-		$this->assertEquals(1, count($tags));

-		$this->assertTrue(in_array("@Mike.because", $tags));
-		

-		$str_tags='';

-		handle_tag($text, $str_tags, 11, $tags[0]);

-	

-		// (mike) - This is a tricky case.
-		// we support mentions as in @mike@example.com - which contains a period.
-		// This shouldn't match anything unless you have a contact named "Mike.because".
-		// We may need another test for "@Mike. because" - which should return the contact
-		// as we ignore trailing periods in tags. 
- 
-//		$this->assertEquals("cid:15", $inform); 
-//		$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
-//		$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text);

-
-		$this->assertEquals("", $str_tags);
-
-	}
-	
-	/**

-	 * test with two Person tags. 
-	 * There's a minor spelling mistake...

-	 */

-
-	public function testGetTagsPerson2Spelling() {

-		$text="hi @Mike@campino@friendica.eu";

-	

-		$tags=get_tags($text);

-
-// This construct is not supported. Results are indeterminate			
-//		$this->assertEquals(2, count($tags)); 

-//		$this->assertTrue(in_array("@Mike", $tags));
-//		$this->assertTrue(in_array("@campino@friendica.eu", $tags));

-	}

-
-	/**
-	 * Test with one hash tag.
-	 */

-	public function testGetTagsShortTag() {

-		$text="This is a #test_case";

-

-		$tags=get_tags($text);

-
-		$this->assertEquals(1, count($tags));

-		$this->assertTrue(in_array("#test_case", $tags));

-	}

-
-	/**
-	 * test with a person and a hash tag
-	 */

-	public function testGetTagsShortTagAndPerson() {

-		$text="hi @Mike This is a #test_case";

-

-		$tags=get_tags($text);

-
-		$this->assertEquals(3, count($tags));
-		$this->assertTrue(in_array("@Mike", $tags));
-		$this->assertTrue(in_array("@Mike This", $tags));

-		$this->assertTrue(in_array("#test_case", $tags));

-
-		$str_tags='';
-		foreach($tags as $tag) {
-			handle_tag($text, $str_tags, 11, $tag);
-		}
-		

-		$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?tag=test%20case]test case[/url]", $str_tags);
-		$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?tag=test%20case]test case[/url]", $text); 
-		

-	}

-
-	/**
-	 * test with a person, a hash tag and some special chars.
-	 */

-	public function testGetTagsShortTagAndPersonSpecialChars() {

-		$text="hi @Mike, This is a #test_case.";

-

-		$tags=get_tags($text);

-

-		$this->assertEquals(2, count($tags));
-		$this->assertTrue(in_array("@Mike", $tags));
-		$this->assertTrue(in_array("#test_case", $tags));

-	}

-
-	/**
-	 * Test with a person tag and text behind it.
-	 */

-	public function testGetTagsPersonOnly() {

-		$text="@Test I saw the Theme Dev group was created.";

-

-		$tags=get_tags($text);

-
-		$this->assertEquals(2, count($tags));

-		$this->assertTrue(in_array("@Test I", $tags));
-		$this->assertTrue(in_array("@Test", $tags));

-	}

-
-	/**
-	 * this test demonstrates strange behaviour by intval. 
-	 * It makes the next test fail. 
-	 */
-	public function testIntval() {
-		$this->assertEquals(15, intval("15 it")); 
-	}
-	
-	/**
-	 * test a tag with an id in it
-	 */
-	public function testIdTag() {
-		$text="Test with @mike+15 id tag"; 
-		
-		$tags=get_tags($text); 
-		
-		$this->assertEquals(2, count($tags)); 
-		$this->assertTrue(in_array("@mike+15", $tags));
-		
-		//happens right now, but it shouldn't be necessary
-		$this->assertTrue(in_array("@mike+15 id", $tags));
-		
-		$str_tags='';
-		foreach($tags as $tag) {
-			handle_tag($text, $str_tags, 11, $tag);
-		}
-		
-		$this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text);

-		$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);

-	}
-	
-	/**
-	 * test with two persons and one special tag.
-	 */

-	public function testGetTags2Persons1TagSpecialChars() {

-		$text="hi @Mike, I'm just writing #test_cases, so"

-		." so @somebody@friendica.com may change #things.";

-

-		$tags=get_tags($text);

-
-		$this->assertEquals(5, count($tags));

-		$this->assertTrue(in_array("@Mike", $tags));

-		$this->assertTrue(in_array("#test_cases", $tags));
-		$this->assertTrue(in_array("@somebody@friendica.com", $tags));

-		$this->assertTrue(in_array("@somebody@friendica.com may", $tags));

-		$this->assertTrue(in_array("#things", $tags));

-	}

-
-	/**
-	 * test with a long text.
-	 */

-	public function testGetTags() {

-		$text="hi @Mike, I'm just writing #test_cases, "

-		." so @somebody@friendica.com may change #things. Of course I "

-		."look for a lot of #pitfalls, like #tags at the end of a sentence "

-		."@comment. I hope noone forgets about @fullstops.because that might"

-		." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? "

-		."Now, add a @first_last tag. ";

-		

-		$tags=get_tags($text);

-

-		$this->assertTrue(in_array("@Mike", $tags));

-		$this->assertTrue(in_array("#test_cases", $tags));

-		$this->assertTrue(in_array("@somebody@friendica.com", $tags));

-		$this->assertTrue(in_array("#things", $tags));

-		$this->assertTrue(in_array("#pitfalls", $tags));

-		$this->assertTrue(in_array("#tags", $tags));

-		$this->assertTrue(in_array("@comment", $tags));

-		$this->assertTrue(in_array("@fullstops.because", $tags));

-		$this->assertTrue(in_array("#things", $tags));

-		$this->assertTrue(in_array("@Mike", $tags));

-		$this->assertTrue(in_array("#nice", $tags));

-		$this->assertTrue(in_array("@first_last", $tags));
-		
-		//right now, none of the is matched (unsupported)
-//		$this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags));

-//		$this->assertTrue(in_array("@campino@friendica.eu", $tags));
-//		$this->assertTrue(in_array("@campino@friendica.eu is", $tags));

-	}

-
-	/**
-	 * test with an empty string
-	 */

-	public function testGetTagsEmpty() {

-		$tags=get_tags("");

-		$this->assertEquals(0, count($tags));

-	}
-}
\ No newline at end of file
diff --git a/tests/unit/includes/FeedutilsTest.php b/tests/unit/includes/FeedutilsTest.php
deleted file mode 100644
index e9826a73d..000000000
--- a/tests/unit/includes/FeedutilsTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Zotlabs\Tests\Unit\includes;
-
-use Zotlabs\Tests\Unit\UnitTestCase;
-
-/**
- * @brief Unit Test case for include/feedutils.php file.
- */
-class FeedutilsTest extends UnitTestCase {
-
-	public function test_normalise_id() {
-		$this->assertEquals('id', normalise_id('id'));
-		$this->assertEquals('id', normalise_id('X-ZOT:id'));
-		$this->assertEquals('id id2', normalise_id('X-ZOT:id X-ZOT:id2'));
-		$this->assertEmpty(normalise_id(''));
-	}
-
-	public function test_encode_rel_links() {
-		// invalid params return empty array
-		$this->assertEquals([], encode_rel_links('string'));
-		$this->assertEquals([], encode_rel_links([]));
-
-		$b = ['attribs' => ['' => [
-				'rel' => 'rel_value',
-				'type' => 'type_value',
-				'href' => 'href_value',
-				'length' => 'length_value',
-				'title' => 'title_value'
-		]]];
-		$blink1 = ['link1' => $b];
-		$bresult[] = $b['attribs'][''];
-		$this->assertEquals($bresult, encode_rel_links($blink1));
-	}
-
-/*	public function test_encode_rel_links_fail() {
-		$a = [ 'key' => 'value'];
-		$this->assertFalse(encode_rel_links($a));
-		//Illegal string offset 'attribs'
-	}*/
-
-	/**
-	 * @uses ::xmlify
-	 */
-	public function test_atom_author() {
-		$this->assertEquals('', atom_author('', 'nick', 'name', 'uri', 72, 72, 'png', 'photourl'));
-
-		$a = '<tag>
-  <id>uri</id>
-  <name>nick</name>
-  <uri>uri</uri>
-  <link rel="photo"  type="png" media:width="72" media:height="72" href="http://photourl" />
-  <link rel="avatar" type="png" media:width="72" media:height="72" href="http://photourl" />
-  <poco:preferredUsername>nick</poco:preferredUsername>
-  <poco:displayName>name</poco:displayName>
-</tag>';
-
-		$this->assertXmlStringEqualsXmlString($a, atom_author('tag', 'nick', 'name', 'uri', 72, 72, 'png', 'http://photourl'));
-	}
-
-	/**
-	 * @uses ::xmlify
-	 */
-	public function test_atom_render_author() {
-		$xchan = [
-				'xchan_addr' => 'chan@hub',
-				'xchan_url' => 'http://hub',
-				'xchan_name' => 'Chan',
-				'xchan_photo_l' => 'http://hub/img',
-				'xchan_photo_mimetype' => 'mimetype'
-		];
-		// There is no input validation in atom_render_author
-		//$this->assertEquals('', atom_render_author('', $xchan));
-
-		$a = '<tag>
-  <as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
-  <id>http://hub</id>
-  <name>chan</name>
-  <uri>http://hub</uri>
-  <link rel="alternate" type="text/html" href="http://hub" />
-  <link rel="photo"  type="mimetype" media:width="300" media:height="300" href="http://hub/img" />
-  <link rel="avatar" type="mimetype" media:width="300" media:height="300" href="http://hub/img" />
-  <poco:preferredUsername>chan</poco:preferredUsername>
-  <poco:displayName>Chan</poco:displayName>
-</tag>';
-
-		$this->assertXmlStringEqualsXmlString($a, atom_render_author('tag', $xchan));
-	}
-}
diff --git a/tests/unit/includes/LanguageTest.php b/tests/unit/includes/LanguageTest.php
deleted file mode 100644
index 0ca9eacd0..000000000
--- a/tests/unit/includes/LanguageTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/*
- * Copyright (c) 2017 Hubzilla
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Zotlabs\Tests\Unit\includes;
-
-use Zotlabs\Tests\Unit\UnitTestCase;
-use Text_LanguageDetect;
-//use phpmock\phpunit\PHPMock;
-
-/**
- * @brief Unit Test cases for include/language.php file.
- *
- * @author Klaus Weidenbach
- */
-class LanguageTest extends UnitTestCase {
-	//use PHPMock;
-
-	/**
-	 * @dataProvider languageExamplesProvider
-	 * @coversNothing
-	 */
-	public function testDetectLanguage($text, $langCode, $confidence) {
-
-		// php-mock can not mock global functions which is called by a global function.
-		// If the calling function is in a namespace it would work.
-		//$gc = $this->getFunctionMock(__NAMESPACE__, 'get_config');
-		//$gc->expects($this->once())->willReturn(10)
-		//$cg = $this->getFunctionMock('Zotlabs\Lib\Config', 'Get');
-		//$cg->expects($this->once())->willReturn(10);
-		//$this->assertEquals($langCode, detect_language($text));
-
-
-		// Can not unit test detect_language(), therefore test the used library
-		// only for now to find regressions on library updates.
-		$l = new Text_LanguageDetect;
-		// return 2-letter ISO 639-1 (en) language code
-		$l->setNameMode(2);
-		$lng = $l->detectConfidence($text);
-
-		$this->assertEquals($langCode, $lng['language']);
-		$this->assertEquals($confidence, round($lng['confidence'], 6));
-	}
-
-	public function languageExamplesProvider() {
-		return [
-				'empty text' => [
-						'',
-						'',
-						null
-				],
-				'English' => [
-						'English is a West Germanic language that was first spoken in early medieval England and is now a global lingua franca.[4][5] Named after the Angles, one of the Germanic tribes that migrated to England, it ultimately derives its name from the Anglia (Angeln) peninsula in the Baltic Sea. It is closely related to the Frisian languages, but its vocabulary has been significantly influenced by other Germanic languages, particularly Norse (a North Germanic language), as well as by Latin and Romance languages, especially French.',
-						'en',
-						0.078422
-				],
-				'German' => [
-						'Deutschland ist ein Bundesstaat in Mitteleuropa. Er besteht aus 16 Ländern und ist als freiheitlich-demokratischer und sozialer Rechtsstaat verfasst. Die Bundesrepublik Deutschland stellt die jüngste Ausprägung des deutschen Nationalstaates dar. Mit rund 82,8 Millionen Einwohnern (31. Dezember 2016) zählt Deutschland zu den dicht besiedelten Flächenstaaten.',
-						'de',
-						0.134339
-				],
-				'Norwegian' => [
-						'Kongeriket Norge er et nordisk, europeisk land og en selvstendig stat vest på Den skandinaviske halvøy. Landet er langt og smalt, og kysten strekker seg langs Nord-Atlanteren, hvor også Norges kjente fjorder befinner seg. Totalt dekker det relativt tynt befolkede landet 385 000 kvadratkilometer med litt over fem millioner innbyggere (2016).',
-						'no',
-						0.007076
-				]
-		];
-	}
-
-
-	/**
-	 * @covers ::get_language_name
-	 * @dataProvider getLanguageNameProvider
-	 */
-	public function testGetLanguageName($lang, $name, $trans) {
-		$this->assertEquals($name, get_language_name($lang));
-		foreach ($trans as $k => $v) {
-			//echo "$k -> $v";
-			$this->assertEquals($v, get_language_name($lang, $k));
-		}
-	}
-
-	public function getLanguageNameProvider() {
-		return [
-				'empty language code' => [
-						'',
-						'',
-						['de' => '']
-				],
-				'invalid language code' => [
-						'zz',
-						'zz',
-						['de' => 'zz']
-				],
-				'de' => [
-						'de',
-						'German',
-						[
-								'de' => 'Deutsch',
-								'nb' => 'tysk'
-						]
-				],
-				'de-de' => [
-						'de-de',
-						'German',
-						[
-								'de-de' => 'Deutsch',
-								'nb' => 'Deutsch' // should be tysk, seems to be a bug upstream
-						]
-				],
-				'en' => [
-						'en',
-						'English',
-						[
-								'de' => 'Englisch',
-								'nb' => 'engelsk'
-						]
-				],
-				'en-gb' => [
-						'en-gb',
-						'British English',
-						[
-								'de' => 'Englisch (Vereinigtes Königreich)',
-								'nb' => 'engelsk (Storbritannia)'
-						]
-				],
-				'en-au' => [
-						'en-au',
-						'Australian English',
-						[
-								'de' => 'Englisch (Australien)',
-								'nb' => 'engelsk (Australia)'
-						]
-				],
-				'nb' => [
-						'nb',
-						'Norwegian Bokmål',
-						[
-								'de' => 'Norwegisch Bokmål',
-								'nb' => 'norsk bokmål'
-						]
-				]
-		];
-	}
-}
diff --git a/tests/unit/includes/MarkdownTest.php b/tests/unit/includes/MarkdownTest.php
deleted file mode 100644
index 2a92a58d2..000000000
--- a/tests/unit/includes/MarkdownTest.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/*
- * Copyright (c) 2017 Hubzilla
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-namespace Zotlabs\Tests\Unit\includes;
-
-use Zotlabs\Tests\Unit\UnitTestCase;
-use phpmock\phpunit\PHPMock;
-
-require_once 'include/markdown.php';
-
-/**
- * @brief Unit Test case for markdown functions.
- */
-class MarkdownTest extends UnitTestCase {
-	use PHPMock;
-
-	/**
-	 * @covers ::html2markdown
-	 * @dataProvider html2markdownProvider
-	 */
-	public function testHtml2markdown($html, $markdown) {
-		$this->assertEquals($markdown, html2markdown($html));
-	}
-
-	public function html2markdownProvider() {
-		return [
-				'empty text' => [
-						'',
-						''
-				],
-				'space and nbsp only' => [
-						' &nbsp;',
-						''
-				],
-
-				'strong, b, em, i, bib' => [
-						'<strong>strong</strong> <b>bold</b> <em>em</em> <i>italic</i>  <b>bo<i>italic</i>ld</b>',
-						'**strong** **bold** *em* *italic* **bo*italic*ld**'
-				],
-
-				'empty tags' => [
-						'text1 <b></b> text2 <i></i>',
-						'text1  text2'
-				],
-				'HTML entities, lt does not work' => [
-						'& gt > lt <',
-						'&amp; gt &gt; lt'
-				],
-				'escaped HTML entities' => [
-						'&amp; lt &lt; gt &gt;',
-						'&amp; lt &lt; gt &gt;'
-				],
-				'linebreak' => [
-						"line1<br>line2\nline3",
-						"line1  \nline2 line3"
-				],
-				'headlines' => [
-						'<h1>header1</h1><h3>Header 3</h3>',
-						"header1\n=======\n\n### Header 3"
-				],
-				'unordered list' => [
-						'<ul><li>Item 1</li><li>Item 2</li><li>Item <b>3</b></li></ul>',
-						"- Item 1\n- Item 2\n- Item **3**"
-				],
-				'ordered list' => [
-						'<ol><li>Item 1</li><li>Item 2</li><li>Item <b>3</b></li></ol>',
-						"1. Item 1\n2. Item 2\n3. Item **3**"
-				],
-				'nested lists' => [
-						'<ul><li>Item 1<ol><li>Item 1a</li><li>Item <b>1b</b></ol></li><li>Item 2</li></ul>',
-						"- Item 1\n  1. Item 1a\n  2. Item **1b**\n- Item 2"
-				],
-				'img' => [
-						'<img src="/path/to/img.png" alt="alt text" title="title text">',
-						'![alt text](/path/to/img.png "title text")'
-				],
-				'link' => [
-						'<a href="http://hubzilla.org" title="Hubzilla">link</a>',
-						'[link](http://hubzilla.org "Hubzilla")'
-				],
-				'img link' => [
-						'<a href="http://hubzilla.org" title="Hubzilla"><img src="/img/hubzilla.png" alt="alt img text" title="img title"></a>',
-						'[![alt img text](/img/hubzilla.png "img title")](http://hubzilla.org "Hubzilla")'
-				],
-				'script' => [
-						"<script>alert('test');</script>",
-						"<script>alert('test');</script>"
-				],
-				'blockquote, issue #793' => [
-						'<blockquote>something</blockquote>blah',
-						"> something\n\nblah"
-				],
-				'code' => [
-						'<code>&lt;p&gt;HTML text&lt;/p&gt;</code>',
-						'`<p>HTML text</p>`'
-				],
-				'pre' => [
-						'<pre>  one line with spaces  </pre>',
-						"```\n  one line with spaces  \n```"
-				],
-				'div p' => [
-						'<div>div</div><div><p>p</p></div>',
-						"<div>div</div><div>p\n\n</div>"
-				]
-		];
-	}
-
-	/*public function testHtml2markdownException() {
-		//$this->expectException(\InvalidArgumentException::class);
-		// need to stub logger() for this to work
-		$this->assertEquals('', html2markdown('<<invalid'));
-	}*/
-
-/*	public function testBB2diasporaMardown() {
-		//stub bbcode() and return our HTML, we just need to test the HTML2Markdown library.
-		$html1 = 'test<b>bold</b><br><i>i</i><ul><li>li1</li><li>li2</li></ul><br>';
-		$bb1 = 'test';
-
-		// php-mock can not mock global functions which is called by a global function.
-		// If the calling function is in a namespace it does work.
-		$bbc = $this->getFunctionMock(__NAMESPACE__, "bbcode");
-		$bbc->expects($this->once())->willReturn('test<b>bold</b><br><i>i</i><ul><li>li1</li><li>li2</li></ul><br>');
-
-		$this->assertEquals($bb1, bb2diaspora($html1));
-	}
-*/
-}
diff --git a/tests/unit/includes/PhotodriverTest.php b/tests/unit/includes/PhotodriverTest.php
deleted file mode 100644
index 6f6ad0ffe..000000000
--- a/tests/unit/includes/PhotodriverTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Zotlabs\Tests\Unit\includes;
-
-//use Zotlabs\Photo\PhotoGd;
-use Zotlabs\Tests\Unit\UnitTestCase;
-//use phpmock\phpunit\PHPMock;
-
-/**
- * @brief Unit Test cases for include/photo/photo_driver.php file.
- */
-class PhotodriverTest extends UnitTestCase {
-	//use PHPMock;
-
-	public function testPhotofactoryReturnsNullForUnsupportedType() {
-		// php-mock can not mock global functions which is called by a global function.
-		// If the calling function is in a namespace it would work.
-		//$logger = $this->getFunctionMock(__NAMESPACE__, 'logger');
-		//$logger->expects($this->once());
-
-		//$ph = \photo_factory('', 'image/bmp');
-		//$this->assertNull($ph);
-
-		$this->markTestIncomplete('Need to mock logger(), otherwise not unit testable.');
-	}
-
-	public function testPhotofactoryReturnsPhotogdIfConfigIgnore_imagickIsSet() {
-		// php-mock can not mock global functions which is called by a global function.
-		// If the calling function is in a namespace it would work.
-		//$gc = $this->getFunctionMock(__NAMESPACE__, 'get_config');
-		// simulate get_config('system', 'ignore_imagick') configured
-		//$gc->expects($this->once())->willReturn(1)
-
-		//$ph = \photo_factory(file_get_contents('images/hz-16.png'), 'image/png');
-		//$this->assertInstanceOf(PhotoGd::class, $ph);
-
-		$this->markTestIncomplete('Need to mock get_config(), otherwise not unit testable.');
-	}
-}
\ No newline at end of file
diff --git a/tests/unit/includes/TextTest.php b/tests/unit/includes/TextTest.php
deleted file mode 100644
index 97fa64895..000000000
--- a/tests/unit/includes/TextTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace Zotlabs\Tests\Unit\includes;
-
-use Zotlabs\Tests\Unit\UnitTestCase;
-
-/**
- * @brief Unit Test case for include/text.php file.
- *
- * @author ken restivo
- */
-class TextTest extends UnitTestCase {
-
-
-	public function testPurifyHTML() {
-		// linebreaks
-		$htmlbr = 'first line<br />
-	one tab preserved
-
-empty line above';
-		$this->assertEquals($htmlbr, purify_html($htmlbr));
-
-		// HTML5 is not supported by HTMLPurifier yet, test our own configuration
-		$html5elements = '<section>section<nav>navigation</nav><article>main<a href="http://hubzilla.org/">hubzilla.org</a></article></section><footer>footer</footer>';
-		$this->assertEquals($html5elements, purify_html($html5elements));
-		$this->assertEquals('<button>button label</button>', purify_html('<button>button label</button>'));
-
-		// unsupported HTML5 elements
-		$this->assertEquals('Your HTML parser does not support HTML5 video.', purify_html('<video controls><source src="movie.ogg" type="video/ogg">Your HTML parser does not support HTML5 video.</video>'));
-		$this->assertEquals('Your HTML parser does not support HTML5 audio.', purify_html('<audio controls><source src="movie.ogg" "type="audio/ogg">Your HTML parser does not support HTML5 audio.</audio>'));
-
-		// preserve f6 and bootstrap additional data attributes from our own configuration
-		$this->assertEquals('<div data-title="title">text</div>', purify_html('<div data-title="title">text</div>'));
-		$this->assertEquals('<ul data-accordion-menu=""><li>item1</li></ul>', purify_html('<ul data-accordion-menu><li>item1</li></ul>'));
-		$this->assertEquals('<ul><li>item1</li></ul>', purify_html('<ul data-accordion-menu-unknown><li>item1</li></ul>'));
-	}
-
-	/**
-	 * @covers ::purify_html
-	 */
-	public function testPurifyHTML_html() {
-		$this->assertEquals('<div id="id01"><p class="class01">ids und classes</p></div>', purify_html('<div id="id01"><p class="class01">ids und classes</p></div>'));
-		$this->assertEquals('<div><p>close missing tags</p></div>', purify_html('<div><p>close missing tags'));
-		$this->assertEquals('<center>deprecated tag</center>', purify_html('<center>deprecated tag</center>'));
-		$this->assertEquals('<span></span><div>illegal nesting</div>', purify_html('<span><div>illegal nesting</div></span>'));
-		$this->assertEquals('<a href="#">link with target</a>', purify_html('<a href="#" target="_blank">link with target</a>'));
-		$this->assertEquals('<a href="#">link with rel="nofollow"</a>', purify_html('<a href="#" rel="nofollow">link with rel="nofollow"</a>'));
-		$this->assertEquals('a b', purify_html('a&nbsp;b'));
-		$this->assertEquals('ä ä € €', purify_html('ä &auml; &euro; &#8364;'));
-		$this->assertEquals('<img src="picture.png" alt="text" />', purify_html('<img src="picture.png" alt="text">'));
-		$this->assertEquals('', purify_html('<iframe width="560" height="315" src="https://www.youtube.com/embed/kiNGx5oL7hk" frameborder="0" allowfullscreen></iframe>'));
-	}
-
-	/**
-	 * @covers ::purify_html
-	 */
-	public function testPurifyHTML_js() {
-		$this->assertEquals('<div></div>', purify_html('<div><img src="javascript:evil();" onload="evil();"></div>'));
-		$this->assertEquals('<a href="#">link</a>', purify_html('<a href="#" onclick="alert(\'xss\')">link</a>'));
-		$this->assertEquals('', purify_html('<IMG SRC="javascript:alert(&#039;XSS&#039;);">'));
-		$this->assertEquals('', purify_html('<script>alter("42")</script>'));
-	}
-
-	/**
-	 * @covers ::purify_html
-	 */
-	public function testPurifyHTML_css() {
-		$this->assertEquals('<p style="color:#FF0000;background-color:#fff;">red</p>', purify_html('<p style="color:red; background-color:#fff">red</p>'));
-		$this->assertEquals('<p>invalid color</p>', purify_html('<p style="color:invalid; background-color:#jjkkmm">invalid color</p>'));
-		$this->assertEquals('<p>invalid style</p>', purify_html('<p style="foo:bar">invalid style</p>'));
-
-		// test our own CSS configuration
-		$this->assertEquals('<div>position removed</div>', purify_html('<div style="position:absolut">position removed</div>'));
-		$this->assertEquals('<div style="position:fixed;">position preserved</div>', purify_html('<div style="position:fixed">position preserved</div>', true));
-		$this->assertEquals('<div>invalid position removed</div>', purify_html('<div style="position:invalid">invalid position removed</div>', true));
-
-		$this->assertEquals('<div>position removed</div>', purify_html('<div style="top:10px; left:3em;">position removed</div>'));
-		$this->assertEquals('<div style="top:10px;left:3em;right:50%;">position preserved</div>', purify_html('<div style="top:10px; left:3em; right:50%;">position preserved</div>', true));
-		$this->assertEquals('<div>invalid position removed</div>', purify_html('<div style="top:10p">invalid position removed</div>', true));
-	}
-
-	/**
-	 * @dataProvider notagsProvider
-	 */
-	public function testNotags($string, $expected) {
-		$this->assertEquals($expected, notags($string));
-	}
-	public function notagsProvider() {
-		return [
-				'empty string' => ['', ''],
-				'simple tag' => ['<value>', '[value]'],
-				'tag pair' => ['<b>text</b>', '[b]text[/b]'],
-				'double angle bracket' => ['<<value', '[[value'],
-				'HTML entity &gt;' => ['&gt;', '&gt;']
-		];
-	}
-
-	/**
-	 * @dataProvider sanitise_aclProvider
-	 */
-	public function testSanitise_acl($string, $expected) {
-		sanitise_acl($string);
-		$this->assertEquals($expected, $string);
-	}
-	public function sanitise_aclProvider() {
-		return [
-				'text' => ['value', '<value>'],
-				'text with angle bracket' => ['<value>', '<[value]>'],
-				'comma separated acls' => ['value1,value2', '<value1,value2>']
-		];
-	}
-
-	public function testUnsetSanitise_acl() {
-		$empty = '';
-		sanitise_acl($empty);
-		$this->assertTrue(isset($empty)); // unset() not working? Would expect false
-		$this->assertEmpty($empty);
-	}
-
-}
diff --git a/tests/unit/includes/dba/DBATest.php b/tests/unit/includes/dba/DBATest.php
deleted file mode 100644
index 900d13083..000000000
--- a/tests/unit/includes/dba/DBATest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/*
- * Copyright (c) 2017 Hubzilla
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Zotlabs\Tests\Unit\includes;
-
-use Zotlabs\Tests\Unit\UnitTestCase;
-
-// required because of process isolation and no autoloading
-require_once 'include/dba/dba_driver.php';
-
-/**
- * @brief Unit Test case for include/dba/DBA.php file.
- *
- * This test needs process isolation because of static \DBA.
- * @runTestsInSeparateProcesses
- */
-class DBATest extends UnitTestCase {
-
-	public function testDbaFactoryMysql() {
-		$this->assertNull(\DBA::$dba);
-
-		$ret = \DBA::dba_factory('server', 'port', 'user', 'pass', 'db', '0');
-		$this->assertInstanceOf('dba_pdo', $ret);
-		$this->assertFalse($ret->connected);
-
-		$this->assertSame('mysql', \DBA::$scheme);
-		$this->assertSame('schema_mysql.sql', \DBA::$install_script);
-		$this->assertSame('0001-01-01 00:00:00', \DBA::$null_date);
-		$this->assertSame('UTC_TIMESTAMP()', \DBA::$utc_now);
-		$this->assertSame('`', \DBA::$tquot);
-	}
-
-	public function testDbaFactoryPostgresql() {
-		$this->assertNull(\DBA::$dba);
-
-		$ret = \DBA::dba_factory('server', 'port', 'user', 'pass', 'db', '1');
-		$this->assertInstanceOf('dba_pdo', $ret);
-		$this->assertFalse($ret->connected);
-
-		$this->assertSame('pgsql', \DBA::$scheme);
-		$this->assertSame('schema_postgres.sql', \DBA::$install_script);
-		$this->assertSame('0001-01-01 00:00:00', \DBA::$null_date);
-		$this->assertSame("now() at time zone 'UTC'", \DBA::$utc_now);
-		$this->assertSame('"', \DBA::$tquot);
-	}
-
-}
diff --git a/tests/unit/includes/dba/_files/account.yml b/tests/unit/includes/dba/_files/account.yml
deleted file mode 100644
index 344bdb799..000000000
--- a/tests/unit/includes/dba/_files/account.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-account:
-  -
-    account_id: 42
-    account_email: "hubzilla@example.com"
-    account_language: "no"
-  -
-    account_id: 43
-    account_email: "hubzilla@example.org"
-    account_language: "de"
diff --git a/tests/unit/includes/dba/dba_pdoTest.php b/tests/unit/includes/dba/dba_pdoTest.php
deleted file mode 100644
index 689f5a7ce..000000000
--- a/tests/unit/includes/dba/dba_pdoTest.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/*
- * Copyright (c) 2017 Hubzilla
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Zotlabs\Tests\Unit\includes;
-
-use Zotlabs\Tests\Unit\DatabaseTestCase;
-use PHPUnit\DbUnit\TestCaseTrait;
-use PHPUnit\DbUnit\DataSet\YamlDataSet;
-
-require_once 'include/dba/dba_pdo.php';
-
-/**
- * @brief Unit Test case for include/dba/dba_pdo.php file.
- *
- * Some very basic tests to see if our database layer can connect to a real
- * database.
- */
-class dba_pdoTest extends DatabaseTestCase {
-
-	use TestCaseTrait;
-
-	/**
-	 * @var \dba_driver
-	 */
-	protected $dba;
-
-
-	/**
-	 * Set initial state of the database before each test is executed.
-	 * Load database fixtures.
-	 *
-	 * @return \PHPUnit\DbUnit\DataSet\IDataSet
-	 */
-	public function getDataSet() {
-		return new YamlDataSet(dirname(__FILE__) . '/_files/account.yml');
-	}
-
-	protected function setUp(): void {
-		// Will invoke getDataSet() to load fixtures into DB
-		parent::setUp();
-
-		$this->dba = new \dba_pdo(
-				\getenv('hz_db_server'),
-				\getenv('hz_db_scheme'),
-				\getenv('hz_db_port'),
-				\getenv('hz_db_user'),
-				\getenv('hz_db_pass'),
-				\getenv('hz_db_database')
-		);
-	}
-	protected function assertPreConditions() {
-		$this->assertSame('pdo', $this->dba->getdriver(), "Driver is expected to be 'pdo'.");
-		$this->assertInstanceOf('dba_driver', $this->dba);
-		$this->assertTrue($this->dba->connected, 'Pre condition failed, DB is not connected.');
-		$this->assertInstanceOf('PDO', $this->dba->db);
-	}
-	protected function tearDown(): void {
-		$this->dba = null;
-	}
-
-
-	/**
-	 * @group mysql
-	 */
-	public function testQuoteintervalOnMysql() {
-		$this->assertSame('value', $this->dba->quote_interval('value'));
-	}
-	/**
-	 * @group postgresql
-	 */
-	public function testQuoteintervalOnPostgresql() {
-		$this->assertSame("'value'", $this->dba->quote_interval('value'));
-	}
-
-	/**
-	 * @group mysql
-	 */
-	public function testGenerateMysqlConcatSql() {
-		$this->assertSame('GROUP_CONCAT(DISTINCT field SEPARATOR \';\')', $this->dba->concat('field', ';'));
-		$this->assertSame('GROUP_CONCAT(DISTINCT field2 SEPARATOR \' \')', $this->dba->concat('field2', ' '));
-	}
-	/**
-	 * @group postgresql
-	 */
-	public function testGeneratePostgresqlConcatSql() {
-		$this->assertSame('string_agg(field,\';\')', $this->dba->concat('field', ';'));
-		$this->assertSame('string_agg(field2,\' \')', $this->dba->concat('field2', ' '));
-	}
-
-
-	public function testConnectToSqlServer() {
-		// connect() is done in dba_pdo constructor which is called in setUp()
-		$this->assertTrue($this->dba->connected);
-	}
-
-	/**
-	 * @depends testConnectToSqlServer
-	 */
-	public function testCloseSqlServerConnection() {
-		$this->dba->close();
-
-		$this->assertNull($this->dba->db);
-		$this->assertFalse($this->dba->connected);
-	}
-
-	/**
-	 * @depends testConnectToSqlServer
-	 */
-	public function testSelectQueryShouldReturnArray() {
-		$ret = $this->dba->q('SELECT * FROM account');
-
-		$this->assertTrue(is_array($ret));
-	}
-
-	/**
-	 * @depends testConnectToSqlServer
-	 */
-	public function testInsertQueryShouldReturnPdostatement() {
-		// Fixture account.yml adds two entries to account table
-		$this->assertEquals(2, $this->getConnection()->getRowCount('account'), 'Pre-Condition');
-
-		$ret = $this->dba->q('INSERT INTO account
-				(account_id, account_email, account_language)
-				 VALUES (100, \'insert@example.com\', \'de\')
-		');
-		$this->assertInstanceOf('PDOStatement', $ret);
-
-		$this->assertEquals(3, $this->getConnection()->getRowCount('account'), 'Inserting failed');
-	}
-
-
-	public function testConnectToWrongSqlServer() {
-		$nodba = new \dba_pdo('wrongserver',
-				\getenv('hz_db_scheme'), \getenv('hz_db_port'),
-				\getenv('hz_db_user'), \getenv('hz_db_pass'),
-				\getenv('hz_db_database')
-		);
-
-		$this->assertSame('pdo', $nodba->getdriver());
-		$this->assertInstanceOf('dba_pdo', $nodba);
-		$this->assertFalse($nodba->connected);
-		$this->assertNull($nodba->db);
-
-		$this->assertFalse($nodba->q('SELECT * FROM account'));
-	}
-
-	/**
-	 * @depends testConnectToSqlServer
-	 */
-	public function testSelectQueryToNonExistentTableShouldReturnFalse() {
-		$ret = $this->dba->q('SELECT * FROM non_existent_table');
-
-		$this->assertFalse($ret);
-	}
-
-	/**
-	 * @depends testConnectToSqlServer
-	 */
-	public function testInsertQueryToNonExistentTableShouldReturnEmptyArray() {
-		$ret = $this->dba->q('INSERT INTO non_existent_table
-				(account_email, account_language)
-				 VALUES (\'email@example.com\', \'en\')
-		');
-
-		$this->assertNotInstanceOf('PDOStatement', $ret);
-		$this->isEmpty($ret);
-	}
-
-}
diff --git a/tests/unit/template_test.php b/tests/unit/template_test.php
deleted file mode 100644
index dfaecb4a1..000000000
--- a/tests/unit/template_test.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**

- * this file contains tests for the template engine

- *

- * @package test.util

- */

-

-/** required, it is the file under test */

-require_once('include/template_processor.php');
-require_once('include/text.php');
-
-class TemplateMockApp {
-	public $theme_info=array();
-}
-
-if(!function_exists('current_theme')) {
-function current_theme() {

-	return 'clean';

-}
-}
-
-if(!function_exists('x')) {
-function x($s,$k = NULL) {
-	return false;
-}
-}
-
-/**

- * TestCase for the template engine

- *

- * @author Alexander Kampmann

- * @package test.util

- */

-class TemplateTest extends PHPUnit_Framework_TestCase {
-
-	public function setUp() {
-		global $t;
-		$t=new Template;
-	}
-
-	public function testListToShort() {
-		@list($first, $second)=array('first');
-
-		$this->assertTrue(is_null($second));
-	}
-
-	public function testSimpleVariableString() {
-		$tpl='Hello $name!';
-
-		$text=replace_macros($tpl, array('$name'=>'Anna'));
-
-		$this->assertEquals('Hello Anna!', $text);
-	}
-
-	public function testSimpleVariableInt() {

-		$tpl='There are $num new messages!';

-

-		$text=replace_macros($tpl, array('$num'=>172));

-

-		$this->assertEquals('There are 172 new messages!', $text);

-	}
-
-	public function testConditionalElse() {

-		$tpl='There{{ if $num!=1 }} are $num new messages{{ else }} is 1 new message{{ endif }}!';

-

-		$text1=replace_macros($tpl, array('$num'=>1));
-		$text22=replace_macros($tpl, array('$num'=>22));

-

-		$this->assertEquals('There is 1 new message!', $text1);
-		$this->assertEquals('There are 22 new messages!', $text22);

-	}
-
-	public function testConditionalNoElse() {

-		$tpl='{{ if $num!=0 }}There are $num new messages!{{ endif }}';

-

-		$text0=replace_macros($tpl, array('$num'=>0));

-		$text22=replace_macros($tpl, array('$num'=>22));

-

-		$this->assertEquals('', $text0);

-		$this->assertEquals('There are 22 new messages!', $text22);

-	}
-
-	public function testConditionalFail() {

-		$tpl='There {{ if $num!=1 }} are $num new messages{{ else }} is 1 new message{{ endif }}!';

-

-		$text1=replace_macros($tpl, array());

-

-		//$this->assertEquals('There is 1 new message!', $text1);

-	}
-
-	public function testSimpleFor() {

-		$tpl='{{ for $messages as $message }} $message {{ endfor }}';

-

-		$text=replace_macros($tpl, array('$messages'=>array('message 1', 'message 2')));

-

-		$this->assertEquals(' message 1  message 2 ', $text);

-	}
-
-	public function testFor() {

-		$tpl='{{ for $messages as $message }} from: $message.from to $message.to {{ endfor }}';

-

-		$text=replace_macros($tpl, array('$messages'=>array(array('from'=>'Mike', 'to'=>'Alex'), array('from'=>'Alex', 'to'=>'Mike'))));

-

-		$this->assertEquals(' from: Mike to Alex  from: Alex to Mike ', $text);

-	}
-	
-	public function testKeyedFor() {

-		$tpl='{{ for $messages as $from=>$to }} from: $from to $to {{ endfor }}';

-	

-		$text=replace_macros($tpl, array('$messages'=>array('Mike'=>'Alex', 'Sven'=>'Mike')));

-	

-		$this->assertEquals(' from: Mike to Alex  from: Sven to Mike ', $text);

-	}
-
-	public function testForEmpty() {

-		$tpl='messages: {{for $messages as $message}} from: $message.from to $message.to  {{ endfor }}';

-

-		$text=replace_macros($tpl, array('$messages'=>array()));

-

-		$this->assertEquals('messages: ', $text);

-	}
-
-	public function testForWrongType() {

-		$tpl='messages: {{for $messages as $message}} from: $message.from to $message.to  {{ endfor }}';

-

-		$text=replace_macros($tpl, array('$messages'=>11));

-

-		$this->assertEquals('messages: ', $text);

-	}
-
-	public function testForConditional() {

-		$tpl='new messages: {{for $messages as $message}}{{ if $message.new }} $message.text{{endif}}{{ endfor }}';

-

-		$text=replace_macros($tpl, array('$messages'=>array(
-				array('new'=>true, 'text'=>'new message'),
-				array('new'=>false, 'text'=>'old message'))));

-

-		$this->assertEquals('new messages:  new message', $text);

-	}
-	
-	public function testConditionalFor() {

-		$tpl='{{ if $enabled }}new messages:{{for $messages as $message}} $message.text{{ endfor }}{{endif}}';

-	

-		$text=replace_macros($tpl, array('$enabled'=>true, 
-				'$messages'=>array(

-				array('new'=>true, 'text'=>'new message'),

-				array('new'=>false, 'text'=>'old message'))));

-	

-		$this->assertEquals('new messages: new message old message', $text);

-	}
-
-	public function testFantasy() {

-		$tpl='Fantasy: {{fantasy $messages}}';

-

-		$text=replace_macros($tpl, array('$messages'=>'no no'));

-

-		$this->assertEquals('Fantasy: {{fantasy no no}}', $text);

-	}
-
-	public function testInc() {

-		$tpl='{{inc field_input.tpl with $field=$myvar}}{{ endinc }}';

-

-		$text=replace_macros($tpl, array('$myvar'=>array('myfield', 'label', 'value', 'help')));

-

-		$this->assertEquals("	\n"
-				."	<div class='field input'>\n"
-				."		<label for='id_myfield'>label</label>\n"
-				."		<input name='myfield' id='id_myfield' value=\"value\">\n"
-				."		<span class='field_help'>help</span>\n"
-				."	</div>\n", $text);

-	}
-
-	public function testIncNoVar() {

-		$tpl='{{inc field_input.tpl }}{{ endinc }}';

-

-		$text=replace_macros($tpl, array('$field'=>array('myfield', 'label', 'value', 'help')));

-

-		$this->assertEquals("	\n	<div class='field input'>\n		<label for='id_myfield'>label</label>\n"

-				."		<input name='myfield' id='id_myfield' value=\"value\">\n"

-				."		<span class='field_help'>help</span>\n"

-				."	</div>\n", $text);

-	}
-	
-	public function testDoubleUse() {

-		$tpl='Hello $name! {{ if $enabled }} I love you! {{ endif }}';

-	

-		$text=replace_macros($tpl, array('$name'=>'Anna', '$enabled'=>false));

-	

-		$this->assertEquals('Hello Anna! ', $text);
-		
-		$tpl='Hey $name! {{ if $enabled }} I hate you! {{ endif }}';

-		

-		$text=replace_macros($tpl, array('$name'=>'Max', '$enabled'=>true));

-		

-		$this->assertEquals('Hey Max!  I hate you! ', $text);

-	}
-	
-	public function testIncDouble() {

-		$tpl='{{inc field_input.tpl with $field=$var1}}{{ endinc }}'
-		.'{{inc field_input.tpl with $field=$var2}}{{ endinc }}';

-	

-		$text=replace_macros($tpl, array('$var1'=>array('myfield', 'label', 'value', 'help'), 
-				'$var2'=>array('myfield2', 'label2', 'value2', 'help2')));

-		

-		$this->assertEquals("	\n"

-				."	<div class='field input'>\n"

-				."		<label for='id_myfield'>label</label>\n"

-				."		<input name='myfield' id='id_myfield' value=\"value\">\n"

-				."		<span class='field_help'>help</span>\n"

-				."	</div>\n"
-				."	\n"
-				."	<div class='field input'>\n"
-				."		<label for='id_myfield2'>label2</label>\n"
-				."		<input name='myfield2' id='id_myfield2' value=\"value2\">\n"
-				."		<span class='field_help'>help2</span>\n"
-				."	</div>\n", $text);

-	}
-}
\ No newline at end of file