diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index bafe66d2c..12dd57b69 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -14,6 +14,7 @@ set(TEST_SOURCES
     Outline.cpp
     Sprite.cpp
     Signal.cpp
+    SignalManager.cpp
     String.cpp
     SvgImage.cpp
     Text.cpp
diff --git a/tests/SignalManager.cpp b/tests/SignalManager.cpp
new file mode 100644
index 000000000..0f877d66c
--- /dev/null
+++ b/tests/SignalManager.cpp
@@ -0,0 +1,118 @@
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// TGUI - Texus' Graphical User Interface
+// Copyright (C) 2012-2019 Bruno Van de Velde (vdv_b@tgui.eu)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "Tests.hpp"
+#include <TGUI/SignalManager.hpp>
+#include <TGUI/SignalManagerImpl.hpp>
+#include <TGUI/Widgets/Button.hpp>
+
+
+TEST_CASE("[SignalManager]")
+{
+    SECTION("connect")
+    {
+        auto tsmg = tgui::SignalManager::getSignalManager();
+
+        std::function<int(tgui::Widget::Ptr)> a = [](tgui::Widget::Ptr s){return s->connect("PositionChanged",  [](sf::Vector2f){});};
+        //IDEA for making connection by lambda function that will get widget name if signal manager can't hold loaded funcions
+
+        unsigned int id = tsmg->connect("NameOfWidget", "PositionChanged", [](){});
+        REQUIRE(tsmg->connect("NameOfWidget", "PositionChanged", [](sf::Vector2f){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "PositionChanged", [](tgui::Vector2f){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "PositionChanged", [](tgui::Widget::Ptr, std::string){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "PositionChanged", [](tgui::Widget::Ptr, std::string, sf::Vector2f){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "PositionChanged", [](tgui::Widget::Ptr, std::string, tgui::Vector2f){}) == ++id);
+
+        REQUIRE(tsmg->connect("NameOfWidget", "SizeChanged", [](){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "SizeChanged", [](sf::Vector2f){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "SizeChanged", [](tgui::Vector2f){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "SizeChanged", [](tgui::Widget::Ptr, std::string){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "SizeChanged", [](tgui::Widget::Ptr, std::string, sf::Vector2f){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "SizeChanged", [](tgui::Widget::Ptr, std::string, tgui::Vector2f){}) == ++id);
+
+        REQUIRE(tsmg->connect("NameOfWidget", "Focused", [](){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Focused", [](tgui::Widget::Ptr, std::string){}) == ++id);
+
+        REQUIRE(tsmg->connect("NameOfWidget", "Unfocused", [](){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Unfocused", [](tgui::Widget::Ptr, std::string){}) == ++id);
+
+        REQUIRE(tsmg->connect("NameOfWidget", "MouseEntered", [](){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "MouseEntered", [](tgui::Widget::Ptr, std::string){}) == ++id);
+
+        REQUIRE(tsmg->connect("NameOfWidget", "MouseLeft", [](){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "MouseLeft", [](tgui::Widget::Ptr, std::string){}) == ++id);
+
+        REQUIRE(tsmg->connect("NameOfWidget", "AnimationFinished", [](){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "AnimationFinished", [](tgui::ShowAnimationType){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "AnimationFinished", [](bool){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "AnimationFinished", [](tgui::ShowAnimationType, bool){}) == ++id);
+
+
+        tgui::Widget::Ptr widget2 = tgui::Button::create();
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", [](){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", [](int){}, 5) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", [](auto){}, 10.f) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", [](tgui::Widget::Ptr, std::string){}) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", [](auto, auto, auto, tgui::Widget::Ptr, std::string){}, "Hey", 15, 3.f) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", std::bind([](int){}, 5)) == ++id);
+
+        REQUIRE(tsmg->connect("NameOfWidget", {"MouseEntered", "MouseLeft"}, [](){}) == id+2);
+        REQUIRE(tsmg->connect("NameOfWidget", {"PositionChanged", "SizeChanged", "MouseEntered", "MouseLeft", "Pressed"}, [](const tgui::Widget::Ptr&, const std::string&){}) == id+7);
+        id += 7;
+
+        struct Class
+        {
+            void signalHandler1() {}
+            void signalHandler2(tgui::Widget::Ptr, const std::string&) {}
+            void signalHandler3(int, float, tgui::Widget::Ptr, const std::string&) {}
+            void signalHandler4(int&, tgui::Widget::Ptr, const std::string&) {}
+            void signalHandler5(int&, const sf::String&) {}
+            void signalHandler6(int&, tgui::Widget::Ptr, const std::string&, std::string) {}
+
+            void signalHandler7() const {}
+            void signalHandler8(tgui::Widget::Ptr, const std::string&) const {}
+            void signalHandler9(int, float, tgui::Widget::Ptr, const std::string&) const {}
+            void signalHandler10(int&, tgui::Widget::Ptr, const std::string&) const {}
+            void signalHandler11(int&, const sf::String&) const {}
+            void signalHandler12(int&, tgui::Widget::Ptr, const std::string&, std::string) const {}
+        };
+
+        int i;
+        Class instance;
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", &Class::signalHandler1, &instance) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", &Class::signalHandler2, &instance) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", &Class::signalHandler3, &instance, 0, 5.f) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", &Class::signalHandler4, &instance, std::ref(i)) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", &Class::signalHandler5, &instance, std::ref(i)) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", &Class::signalHandler6, &instance, std::ref(i)) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", &Class::signalHandler7, &instance) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", &Class::signalHandler8, &instance) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", &Class::signalHandler9, &instance, 0, 0.5f) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", &Class::signalHandler10, &instance, std::ref(i)) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", &Class::signalHandler11, &instance, std::ref(i)) == ++id);
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", &Class::signalHandler12, &instance, std::ref(i)) == ++id);
+
+        REQUIRE(tsmg->connect("NameOfWidget", "Pressed", std::function<void(std::string)>([](std::string){})) == ++id);
+    }
+}