diff --git a/modules/Terminal/Container.mpp b/modules/Terminal/Container.mpp
index a674d14b..bdf4b37d 100644
--- a/modules/Terminal/Container.mpp
+++ b/modules/Terminal/Container.mpp
@@ -42,7 +42,7 @@ export namespace CppUtils::Terminal
 			return dynamic_cast<T&>(*self.m_widget);
 		}
 
-		template<typename T, typename... Args>
+		template<class T, class... Args>
 		requires std::derived_from<T, Widget>
 		inline auto newWidget(Args&&... args) -> T&
 		{
diff --git a/tests/UnitTests.mpp b/tests/UnitTests.mpp
index 2e651247..8475636d 100644
--- a/tests/UnitTests.mpp
+++ b/tests/UnitTests.mpp
@@ -74,16 +74,21 @@ export import CppUtils.UnitTests.String.Encoding;
 export import CppUtils.UnitTests.String.Utility;
 export import CppUtils.UnitTests.System.Error;
 export import CppUtils.UnitTests.Terminal;
+export import CppUtils.UnitTests.Terminal.AutoScroll;
 export import CppUtils.UnitTests.Terminal.Button;
 export import CppUtils.UnitTests.Terminal.Canvas;
+export import CppUtils.UnitTests.Terminal.Element;
+export import CppUtils.UnitTests.Terminal.Layout;
 export import CppUtils.UnitTests.Terminal.Mouse;
 export import CppUtils.UnitTests.Terminal.Primitive;
 export import CppUtils.UnitTests.Terminal.ProgressBar;
 export import CppUtils.UnitTests.Terminal.RawTerminal;
 export import CppUtils.UnitTests.Terminal.Scrollable;
+export import CppUtils.UnitTests.Terminal.Text;
 export import CppUtils.UnitTests.Terminal.Title;
 export import CppUtils.UnitTests.Terminal.Utility;
 export import CppUtils.UnitTests.Thread.AsyncEventDispatcher;
+export import CppUtils.UnitTests.Thread.Poll;
 export import CppUtils.UnitTests.Thread.ScheduledEventDispatcher;
 export import CppUtils.UnitTests.Thread.Scheduler;
 export import CppUtils.UnitTests.Thread.SharedLocker;
@@ -97,5 +102,6 @@ export import CppUtils.UnitTests.Type.Mapping;
 export import CppUtils.UnitTests.Type.ReadWriteAdapter;
 export import CppUtils.UnitTests.Type.Serializer;
 export import CppUtils.UnitTests.Type.Tuple;
+export import CppUtils.UnitTests.Type.TypeMapping;
 export import CppUtils.UnitTests.UnitTest;
 export import CppUtils.UnitTests.UnitTest.LifetimeChecker;