diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index c539e626..1a382916 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -28,16 +28,5 @@ ctest_resourcematch_test_SOURCES = %reldir%/ctest_resourcematch.c
 ctest_resourcematch_test_LDADD = libice_ctest.la icecast-resourcematch.o
 check_PROGRAMS += ctest_resourcematch.test
 
-ctest_refobject_test_SOURCES = %reldir%/ctest_refobject.c
-ctest_refobject_test_LDADD = libice_ctest.la \
-    icecast-refobject.o
-check_PROGRAMS += ctest_refobject.test
-
-ctest_buffer_test_SOURCES = %reldir%/ctest_buffer.c
-ctest_buffer_test_LDADD = libice_ctest.la \
-    icecast-refobject.o \
-    icecast-buffer.o
-check_PROGRAMS += ctest_buffer.test
-
 # Add all programs to TESTS
 TESTS = $(check_PROGRAMS)
diff --git a/src/tests/ctest_buffer.c b/src/tests/ctest_buffer.c
deleted file mode 100644
index 682d3e00..00000000
--- a/src/tests/ctest_buffer.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/* Icecast
- *
- * This program is distributed under the GNU General Public License, version 2.
- * A copy of this license is included with this source.
- *
- * Copyright 2018,      Philipp "ph3-der-loewe" Schafft <lion@lion.leolix.org>,
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-
-#include "ctest_lib.h"
-
-#include "../src/buffer.h"
-#include "../src/refobject.h"
-
-static void test_create_ref_unref(void)
-{
-    buffer_t *a;
-
-    a = buffer_new(-1, NULL, NULL, REFOBJECT_NULL);
-    ctest_test("buffer created", a != NULL);
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-
-    a = refobject_new(buffer_t);
-    ctest_test("buffer created", a != NULL);
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-
-}
-
-static void test_name(void)
-{
-    buffer_t *a;
-    const char *name = "test object name";
-    const char *ret;
-
-    a = buffer_new(-1, NULL, name, REFOBJECT_NULL);
-    ctest_test("buffer created", a != NULL);
-
-    ret = refobject_get_name(a);
-    ctest_test("get name", ret != NULL);
-    ctest_test("name match", strcmp(name, ret) == 0);
-
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-}
-
-static void test_userdata(void)
-{
-    buffer_t *a;
-    int tmp = 0;
-    void *userdata = &tmp;
-    void *ret;
-
-    a = buffer_new(-1, NULL, NULL, REFOBJECT_NULL);
-    ctest_test("buffer created", a != NULL);
-    ret = refobject_get_userdata(a);
-    ctest_test("get userdata", ret == NULL);
-    ctest_test("set userdata", refobject_set_userdata(a, userdata) == 0);
-    ret = refobject_get_userdata(a);
-    ctest_test("get userdata", ret == userdata);
-    ctest_test("clearing userdata", refobject_set_userdata(a, NULL) == 0);
-    ret = refobject_get_userdata(a);
-    ctest_test("get userdata", ret == NULL);
-
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-
-    a = buffer_new(-1, userdata, NULL, REFOBJECT_NULL);
-    ctest_test("buffer created", a != NULL);
-    ctest_test("refobject created", !REFOBJECT_IS_NULL(a));
-    ret = refobject_get_userdata(a);
-    ctest_test("get userdata", ret == userdata);
-    ctest_test("clearing userdata", refobject_set_userdata(a, NULL) == 0);
-    ret = refobject_get_userdata(a);
-    ctest_test("get userdata", ret == NULL);
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-}
-
-static void test_associated(void)
-{
-    refobject_base_t *a;
-    buffer_t *b;
-
-    a = refobject_new(refobject_base_t);
-    ctest_test("refobject created", !REFOBJECT_IS_NULL(a));
-
-
-    b = buffer_new(-1, NULL, NULL, a);
-    ctest_test("buffer created with associated", !REFOBJECT_IS_NULL(b));
-
-    ctest_test("un-referenced (1 of 2)", refobject_unref(b) == 0);
-    ctest_test("un-referenced (2 of 2)", refobject_unref(a) == 0);
-}
-
-static void test_empty(void)
-{
-    buffer_t *a;
-    const void *data = &data;
-    size_t length = 5;
-    const char *string;
-    int ret;
-
-    a = refobject_new(buffer_t);
-    ctest_test("buffer created", a != NULL);
-
-    ret = buffer_get_data(a, &data, &length);
-    ctest_test("got data and length from buffer", ret == 0);
-    if (ret == 0) {
-        ctest_test("data is updated", data != &data);
-        ctest_test("length is zero", length == 0);
-    }
-
-    data = &data;
-    ret = buffer_get_data(a, &data, NULL);
-    ctest_test("got data from buffer", ret == 0);
-    if (ret == 0) {
-        ctest_test("data is updated", data != &data);
-    }
-
-    length = 5;
-    ret = buffer_get_data(a, NULL, &length);
-    ctest_test("got length from buffer", ret == 0);
-    if (ret == 0) {
-        ctest_test("length is zero", length == 0);
-    }
-
-    ret = buffer_get_string(a, &string);
-    ctest_test("got string from buffer", ret == 0);
-    if (ret == 0) {
-        ctest_test("string is non-NULL", string != NULL);
-        if (string != NULL) {
-            ctest_test("string is empty", *string == 0);
-        }
-    }
-
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-}
-
-static void test_string(void)
-{
-    buffer_t *a;
-    const char *hw = "Hello World!";
-    const char *count = "0 1 2 3 4";
-    const char *combined = "Hello World!" "0 1 2 3 4";
-    const char *string = NULL;
-    int ret;
-
-    a = refobject_new(buffer_t);
-    ctest_test("buffer created", a != NULL);
-    ctest_test("pushed string", buffer_push_string(a, hw) == 0);
-    ret = buffer_get_string(a, &string);
-    ctest_test("got strong", ret == 0);
-    if (ret == 0) {
-        ctest_test("string is non-NULL", string != NULL);
-        if (string != NULL) {
-            ctest_test("string matches input", strcmp(string, hw) == 0);
-        }
-    }
-
-    ctest_test("pushed string", buffer_push_string(a, count) == 0);
-    string = NULL;
-    ret = buffer_get_string(a, &string);
-    ctest_test("got strong", ret == 0);
-    if (ret == 0) {
-        ctest_test("string is non-NULL", string != NULL);
-        if (string != NULL) {
-            ctest_test("string matches combined input", strcmp(string, combined) == 0);
-        }
-    }
-
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-}
-
-static void test_binary(void)
-{
-    buffer_t *a;
-    char pattern_a[8] = {0x01, 0x10, 0x80, 0xFF,  0x00, 0x55, 0xEE, 0xAA};
-    char pattern_b[9] = {0x02, 0x03, 0xF0, 0x80,  0x0F, 0x04, 0x1A, 0x7F, 0x33};
-    int ret;
-    size_t length;
-    const void *data;
-
-    a = refobject_new(buffer_t);
-    ctest_test("buffer created", a != NULL);
-
-    ctest_test("pushed data pattern a", buffer_push_data(a, pattern_a, sizeof(pattern_a)) == 0);
-    length = sizeof(pattern_a) + 42;
-    data = &data;
-    ret = buffer_get_data(a, &data, &length);
-    ctest_test("got data", ret == 0);
-    if (ret == 0) {
-        ctest_test("correct length was returned", length == sizeof(pattern_a));
-        ctest_test("data is non-NULL", data != NULL);
-        ctest_test("data has been set", data != &data);
-        if (length == sizeof(pattern_a) && data != NULL && data != &data) {
-            ctest_test("data matches pattern", memcmp(data, pattern_a, sizeof(pattern_a)) == 0);
-        }
-    }
-
-    ctest_test("pushed data pattern b", buffer_push_data(a, pattern_b, sizeof(pattern_b)) == 0);
-    length = sizeof(pattern_a) + sizeof(pattern_b) + 42;
-    data = &data;
-    ret = buffer_get_data(a, &data, &length);
-    ctest_test("got data", ret == 0);
-    if (ret == 0) {
-        ctest_test("correct length was returned", length == (sizeof(pattern_a) + sizeof(pattern_b)));
-        ctest_test("data is non-NULL", data != NULL);
-        ctest_test("data has been set", data != &data);
-        if (length == (sizeof(pattern_a) + sizeof(pattern_b)) && data != NULL && data != &data) {
-            ctest_test("data matches combined pattern", memcmp(data, pattern_a, sizeof(pattern_a)) == 0 && memcmp(data + sizeof(pattern_a), pattern_b, sizeof(pattern_b)) == 0);
-        }
-    }
-
-
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-}
-
-static void test__compare_to_string(buffer_t *a, const char *testname, const char *pattern)
-{
-    const char *string = NULL;
-    int ret;
-
-    ret = buffer_get_string(a, &string);
-    ctest_test("got strong", ret == 0);
-    if (ret == 0) {
-        ctest_test("string is non-NULL", string != NULL);
-        if (string != NULL) {
-            ctest_test(testname, strcmp(string, pattern) == 0);
-            ctest_diagnostic_printf("string=\"%s\", pattern=\"%s\"", string, pattern);
-        }
-    }
-}
-
-static void test_shift(void)
-{
-    buffer_t *a;
-    const char *pattern = "AABBBCC";
-
-    a = refobject_new(buffer_t);
-    ctest_test("buffer created", a != NULL);
-
-    ctest_test("pushed string", buffer_push_string(a, pattern) == 0);
-    test__compare_to_string(a, "string matches input", pattern);
-    ctest_test("shifted data by 0 bytes", buffer_shift(a, 0) == 0);
-    test__compare_to_string(a, "string matches input (no shift happened)", pattern);
-    ctest_test("shifted data by 2 bytes", buffer_shift(a, 2) == 0);
-    test__compare_to_string(a, "string matches shifted input", pattern + 2);
-    ctest_test("shifted data by 3 bytes", buffer_shift(a, 3) == 0);
-    test__compare_to_string(a, "string matches shifted input", pattern + 2 + 3);
-    ctest_test("shifted data by 3 bytes", buffer_shift(a, 2) == 0);
-    test__compare_to_string(a, "string matches shifted input", pattern + 2 + 3 + 2);
-    ctest_test("shifted data beyond end (42 bytes)", buffer_shift(a, 42) != 0);
-
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-}
-
-static void test_length(void)
-{
-    buffer_t *a;
-    const char *pattern = "AABBBCC";
-    const char *match_a = "AABBB";
-    const char *match_b = "AABB";
-    const char *match_c = "";
-
-    a = refobject_new(buffer_t);
-    ctest_test("buffer created", a != NULL);
-
-    ctest_test("pushed string", buffer_push_string(a, pattern) == 0);
-    test__compare_to_string(a, "string matches input", pattern);
-    ctest_test("Set length to match pattern a", buffer_set_length(a, strlen(match_a)) == 0);
-    test__compare_to_string(a, "string matches pattern a", match_a);
-    ctest_test("Set length to match pattern b", buffer_set_length(a, strlen(match_b)) == 0);
-    test__compare_to_string(a, "string matches pattern a", match_b);
-    ctest_test("Set length to match pattern c", buffer_set_length(a, strlen(match_c)) == 0);
-    test__compare_to_string(a, "string matches pattern a", match_c);
-    ctest_test("Set length to match pattern a (again)", buffer_set_length(a, strlen(match_a)) != 0);
-    test__compare_to_string(a, "string still matches pattern c", match_c);
-
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-}
-
-static void test_printf(void)
-{
-    buffer_t *a;
-    const char *str = "Hello World!";
-    const int num = -127;
-    const char *match_a = ":Hello World!:";
-    const char *match_b = ":Hello World!:<-127 >";
-    const char *match_c = ":Hello World!:<-127 >? +127?";
-
-    a = refobject_new(buffer_t);
-    ctest_test("buffer created", a != NULL);
-
-    ctest_test("Set length to match pattern a", buffer_push_printf(a, ":%s:", str) == 0);
-    test__compare_to_string(a, "string matches pattern a", match_a);
-    ctest_test("Set length to match pattern a", buffer_push_printf(a, "<%-5i>", num) == 0);
-    test__compare_to_string(a, "string matches pattern b", match_b);
-    ctest_test("Set length to match pattern a", buffer_push_printf(a, "?%+5i?", -num) == 0);
-    test__compare_to_string(a, "string matches pattern c", match_c);
-
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-}
-
-static void test_push_buffer(void)
-{
-    buffer_t *a;
-    buffer_t *b;
-    const char *pattern = "AABBBCC";
-    const char *match_a = "AABBBCCAABBBCC";
-
-    a = refobject_new(buffer_t);
-    ctest_test("buffer a created", a != NULL);
-    b = refobject_new(buffer_t);
-    ctest_test("buffer b created", b != NULL);
-
-    ctest_test("pushed string", buffer_push_string(a, pattern) == 0);
-    test__compare_to_string(a, "string matches input", pattern);
-
-    ctest_test("pushed buffer a to b", buffer_push_buffer(b, a) == 0);
-    test__compare_to_string(b, "string matches input", pattern);
-
-    ctest_test("pushed buffer a to b", buffer_push_buffer(b, a) == 0);
-    test__compare_to_string(b, "string matches pattern a", match_a);
-
-    ctest_test("un-referenced b", refobject_unref(b) == 0);
-    ctest_test("un-referenced a", refobject_unref(a) == 0);
-}
-
-int main (void)
-{
-    ctest_init();
-
-
-    test_create_ref_unref();
-
-    test_name();
-    test_userdata();
-    test_associated();
-
-    test_empty();
-    test_string();
-    test_binary();
-
-    test_shift();
-    test_length();
-
-    test_printf();
-    test_push_buffer();
-
-    ctest_fin();
-
-    return 0;
-}
diff --git a/src/tests/ctest_refobject.c b/src/tests/ctest_refobject.c
deleted file mode 100644
index 36cb292e..00000000
--- a/src/tests/ctest_refobject.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* Icecast
- *
- * This program is distributed under the GNU General Public License, version 2.
- * A copy of this license is included with this source.
- *
- * Copyright 2018,      Philipp "ph3-der-loewe" Schafft <lion@lion.leolix.org>,
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-
-#include "ctest_lib.h"
-
-#include "../refobject.h"
-
-static void test_ptr(void)
-{
-    refobject_t a;
-
-    a = REFOBJECT_NULL;
-    ctest_test("NULL is NULL", REFOBJECT_IS_NULL(a));
-
-    if (!REFOBJECT_IS_NULL(a))
-        ctest_bailed_out();
-}
-
-static void test_create_ref_unref(void)
-{
-    refobject_base_t *a;
-
-    a = refobject_new(refobject_base_t);
-    ctest_test("refobject created", !REFOBJECT_IS_NULL(a));
-
-    ctest_test("referenced", refobject_ref(a) == 0);
-    ctest_test("un-referenced (1 of 2)", refobject_unref(a) == 0);
-    ctest_test("un-referenced (2 of 2)", refobject_unref(a) == 0);
-}
-
-static void test_typename(void)
-{
-    refobject_base_t *a;
-    const char *typename;
-
-    a = refobject_new(refobject_base_t);
-    ctest_test("refobject created", !REFOBJECT_IS_NULL(a));
-
-    typename = REFOBJECT_GET_TYPENAME(a);
-    ctest_test("got typename", typename != NULL);
-    ctest_test("typename matches", strcmp(typename, "refobject_base_t") == 0);
-
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-}
-
-static void test_valid(void)
-{
-    refobject_base_t *a;
-
-    typedef struct {
-        refobject_base_t __base;
-    } ctest_test_type_t;
-
-    REFOBJECT_DEFINE_PRIVATE_TYPE(ctest_test_type_t);
-
-    ctest_test("NULL is not valid", !REFOBJECT_IS_VALID(REFOBJECT_NULL, refobject_base_t));
-
-    a = refobject_new(refobject_base_t);
-    ctest_test("refobject created", !REFOBJECT_IS_NULL(a));
-
-    ctest_test("is valid", REFOBJECT_IS_VALID(a, refobject_base_t));
-    ctest_test("is valid as diffrent type", !REFOBJECT_IS_VALID(a, ctest_test_type_t));
-
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-}
-
-static void test_sizes(void)
-{
-    refobject_t a;
-
-    typedef struct {
-        refobject_base_t __base;
-        char padding[1024];
-    } ctest_test_type_a_t;
-    REFOBJECT_DEFINE_PRIVATE_TYPE(ctest_test_type_a_t,
-            REFOBJECT_DEFINE_TYPE_NEW_NOOP()
-            );
-
-    typedef struct {
-        refobject_base_t __base;
-        char padding[131072];
-    } ctest_test_type_b_t;
-    REFOBJECT_DEFINE_PRIVATE_TYPE(ctest_test_type_b_t,
-            REFOBJECT_DEFINE_TYPE_NEW_NOOP()
-            );
-
-    typedef struct {
-        char padding[sizeof(refobject_base_t) - 1];
-    } ctest_test_type_c_t;
-    REFOBJECT_DEFINE_PRIVATE_TYPE(ctest_test_type_c_t,
-            REFOBJECT_DEFINE_TYPE_NEW_NOOP()
-            );
-
-    typedef struct {
-        char padding[0];
-    } ctest_test_type_d_t;
-    REFOBJECT_DEFINE_PRIVATE_TYPE(ctest_test_type_d_t,
-            REFOBJECT_DEFINE_TYPE_NEW_NOOP()
-            );
-
-    a = REFOBJECT_FROM_TYPE(refobject_new(ctest_test_type_a_t));
-    ctest_test("refobject created with size=sizeof(refobject_base_t) + 1024", !REFOBJECT_IS_NULL(a));
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-
-    a = REFOBJECT_FROM_TYPE(refobject_new(ctest_test_type_b_t));
-    ctest_test("refobject created with size=sizeof(refobject_base_t) + 131072", !REFOBJECT_IS_NULL(a));
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-
-    a = REFOBJECT_FROM_TYPE(refobject_new(ctest_test_type_c_t));
-    ctest_test("refobject created with size=sizeof(refobject_base_t) - 1", REFOBJECT_IS_NULL(a));
-    if (!REFOBJECT_IS_NULL(a)) {
-        ctest_test("un-referenced", refobject_unref(a) == 0);
-    }
-
-    a = REFOBJECT_FROM_TYPE(refobject_new(ctest_test_type_d_t));
-    ctest_test("refobject created with size=0", REFOBJECT_IS_NULL(a));
-    if (!REFOBJECT_IS_NULL(a)) {
-        ctest_test("un-referenced", refobject_unref(a) == 0);
-    }
-}
-
-static void test_name(void)
-{
-    refobject_base_t *a;
-    const char *name = "test object name";
-    const char *ret;
-
-    a = refobject_new_ext(refobject_base_t, NULL, name, REFOBJECT_NULL);
-    ctest_test("refobject created", !REFOBJECT_IS_NULL(a));
-
-    ret = refobject_get_name(a);
-    ctest_test("get name", ret != NULL);
-    ctest_test("name match", strcmp(name, ret) == 0);
-
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-}
-
-static void test_userdata(void)
-{
-    refobject_base_t *a;
-    int tmp = 0;
-    void *userdata = &tmp;
-    void *ret;
-
-    a = refobject_new(refobject_base_t);
-    ctest_test("refobject created", !REFOBJECT_IS_NULL(a));
-
-    ret = refobject_get_userdata(a);
-    ctest_test("get userdata", ret == NULL);
-    ctest_test("set userdata", refobject_set_userdata(a, userdata) == 0);
-    ret = refobject_get_userdata(a);
-    ctest_test("get userdata", ret == userdata);
-    ctest_test("clearing userdata", refobject_set_userdata(a, NULL) == 0);
-    ret = refobject_get_userdata(a);
-    ctest_test("get userdata", ret == NULL);
-
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-
-    a = refobject_new_ext(refobject_base_t, userdata, NULL, REFOBJECT_NULL);
-    ctest_test("refobject created", !REFOBJECT_IS_NULL(a));
-    ret = refobject_get_userdata(a);
-    ctest_test("get userdata", ret == userdata);
-    ctest_test("clearing userdata", refobject_set_userdata(a, NULL) == 0);
-    ret = refobject_get_userdata(a);
-    ctest_test("get userdata", ret == NULL);
-    ctest_test("un-referenced", refobject_unref(a) == 0);
-}
-
-static void test_associated(void)
-{
-    refobject_base_t *a, *b;
-
-    a = refobject_new(refobject_base_t);
-    ctest_test("refobject created", !REFOBJECT_IS_NULL(a));
-
-    b = refobject_new_ext(refobject_base_t, NULL, NULL, a);
-    ctest_test("refobject created with associated", !REFOBJECT_IS_NULL(b));
-
-    ctest_test("un-referenced (1 of 2)", refobject_unref(b) == 0);
-    ctest_test("un-referenced (2 of 2)", refobject_unref(a) == 0);
-}
-
-static size_t test_freecb__called;
-static void test_freecb__freecb(refobject_t self, void **userdata)
-{
-    test_freecb__called++;
-}
-
-static void test_freecb(void)
-{
-    typedef struct {
-        refobject_base_t __base;
-    } ctest_test_type_t;
-    ctest_test_type_t *a;
-
-    REFOBJECT_DEFINE_PRIVATE_TYPE(ctest_test_type_t,
-            REFOBJECT_DEFINE_TYPE_FREE(test_freecb__freecb),
-            REFOBJECT_DEFINE_TYPE_NEW_NOOP()
-            );
-
-    test_freecb__called = 0;
-    a = refobject_new(ctest_test_type_t);
-    ctest_test("refobject created", a != NULL);
-    ctest_test("un-referenced", refobject_unref(REFOBJECT_FROM_TYPE(a)) == 0);
-    ctest_test("freecb called", test_freecb__called == 1);
-
-    test_freecb__called = 0;
-    a = refobject_new(ctest_test_type_t);
-    ctest_test("refobject created", a != NULL);
-    ctest_test("referenced", refobject_ref(REFOBJECT_FROM_TYPE(a)) == 0);
-    ctest_test("freecb uncalled", test_freecb__called == 0);
-    ctest_test("un-referenced (1 of 2)", refobject_unref(REFOBJECT_FROM_TYPE(a)) == 0);
-    ctest_test("freecb uncalled", test_freecb__called == 0);
-    ctest_test("un-referenced (2 of 2)", refobject_unref(REFOBJECT_FROM_TYPE(a)) == 0);
-    ctest_test("freecb called", test_freecb__called == 1);
-}
-
-int main (void)
-{
-    ctest_init();
-
-    test_ptr();
-
-    if (ctest_bailed_out()) {
-        ctest_fin();
-        return 1;
-    }
-
-    test_create_ref_unref();
-
-    test_typename();
-    test_valid();
-
-    test_sizes();
-
-    test_name();
-    test_userdata();
-    test_associated();
-    test_freecb();
-
-    ctest_fin();
-
-    return 0;
-}