diff --git a/apps/opencs/model/world/universalid.cpp b/apps/opencs/model/world/universalid.cpp
index a4afa56706..7fc0b97911 100644
--- a/apps/opencs/model/world/universalid.cpp
+++ b/apps/opencs/model/world/universalid.cpp
@@ -272,7 +272,7 @@ CSMWorld::UniversalId::UniversalId(Type type, const std::string& id)
             mClass = sIdArg[i].mClass;
             return;
         }
-    throw std::logic_error("invalid ID argument UniversalId type");
+    throw std::logic_error("invalid ID argument UniversalId type: " + std::to_string(type));
 }
 
 CSMWorld::UniversalId::UniversalId(Type type, const ESM::RefId& id)
@@ -292,7 +292,7 @@ CSMWorld::UniversalId::UniversalId(Type type, int index)
             return;
         }
 
-    throw std::logic_error("invalid index argument UniversalId type");
+    throw std::logic_error("invalid index argument UniversalId type: " + std::to_string(type));
 }
 
 CSMWorld::UniversalId::Class CSMWorld::UniversalId::getClass() const
diff --git a/apps/opencs_tests/CMakeLists.txt b/apps/opencs_tests/CMakeLists.txt
index 92b14b797f..5d76dc2032 100644
--- a/apps/opencs_tests/CMakeLists.txt
+++ b/apps/opencs_tests/CMakeLists.txt
@@ -1,6 +1,7 @@
 file(GLOB OPENCS_TESTS_SRC_FILES
     main.cpp
     model/world/testinfocollection.cpp
+    model/world/testuniversalid.cpp
 )
 
 source_group(apps\\openmw-cs-tests FILES ${OPENCS_TESTS_SRC_FILES})
diff --git a/apps/opencs_tests/model/world/testuniversalid.cpp b/apps/opencs_tests/model/world/testuniversalid.cpp
new file mode 100644
index 0000000000..a891f7528b
--- /dev/null
+++ b/apps/opencs_tests/model/world/testuniversalid.cpp
@@ -0,0 +1,157 @@
+#include "apps/opencs/model/world/universalid.hpp"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <stdexcept>
+
+namespace CSMWorld
+{
+    namespace
+    {
+        using namespace ::testing;
+
+        TEST(CSMWorldUniversalIdTest, shouldFailToConstructFromNoneWithInvalidType)
+        {
+            EXPECT_THROW(
+                UniversalId{ static_cast<UniversalId::Type>(std::numeric_limits<int>::max()) }, std::logic_error);
+        }
+
+        TEST(CSMWorldUniversalIdTest, shouldFailToConstructFromStringWithInvalidType)
+        {
+            EXPECT_THROW(UniversalId(UniversalId::Type_Search, "invalid"), std::logic_error);
+        }
+
+        TEST(CSMWorldUniversalIdTest, shouldFailToConstructFromIntWithInvalidType)
+        {
+            EXPECT_THROW(UniversalId(UniversalId::Type_Activator, 42), std::logic_error);
+        }
+
+        TEST(CSMWorldUniversalIdTest, shouldFailToConstructFromInvalidUniversalIdString)
+        {
+            EXPECT_THROW(UniversalId("invalid"), std::runtime_error);
+        }
+
+        TEST(CSMWorldUniversalIdTest, getIndexShouldThrowExceptionForDefaultConstructed)
+        {
+            const UniversalId id;
+            EXPECT_THROW(id.getIndex(), std::logic_error);
+        }
+
+        TEST(CSMWorldUniversalIdTest, getIndexShouldThrowExceptionForConstructedFromString)
+        {
+            const UniversalId id(UniversalId::Type_Activator, "a");
+            EXPECT_THROW(id.getIndex(), std::logic_error);
+        }
+
+        TEST(CSMWorldUniversalIdTest, getIndexShouldReturnValueForConstructedFromInt)
+        {
+            const UniversalId id(UniversalId::Type_Search, 42);
+            EXPECT_EQ(id.getIndex(), 42);
+        }
+
+        TEST(CSMWorldUniversalIdTest, getIdShouldThrowExceptionForConstructedFromInt)
+        {
+            const UniversalId id(UniversalId::Type_Search, 42);
+            EXPECT_THROW(id.getId(), std::logic_error);
+        }
+
+        TEST(CSMWorldUniversalIdTest, getIdShouldReturnValueForConstructedFromString)
+        {
+            const UniversalId id(UniversalId::Type_Activator, "a");
+            EXPECT_EQ(id.getId(), "a");
+        }
+
+        struct Params
+        {
+            UniversalId mId;
+            UniversalId::Type mType;
+            UniversalId::Class mClass;
+            UniversalId::ArgumentType mArgumentType;
+            std::string mTypeName;
+            std::string mString;
+            std::string mIcon;
+        };
+
+        struct CSMWorldUniversalIdValidPerTypeTest : TestWithParam<Params>
+        {
+        };
+
+        TEST_P(CSMWorldUniversalIdValidPerTypeTest, getTypeShouldReturnExpected)
+        {
+            EXPECT_EQ(GetParam().mId.getType(), GetParam().mType);
+        }
+
+        TEST_P(CSMWorldUniversalIdValidPerTypeTest, getClassShouldReturnExpected)
+        {
+            EXPECT_EQ(GetParam().mId.getClass(), GetParam().mClass);
+        }
+
+        TEST_P(CSMWorldUniversalIdValidPerTypeTest, getArgumentTypeShouldReturnExpected)
+        {
+            EXPECT_EQ(GetParam().mId.getArgumentType(), GetParam().mArgumentType);
+        }
+
+        TEST_P(CSMWorldUniversalIdValidPerTypeTest, shouldBeEqualToCopy)
+        {
+            EXPECT_EQ(GetParam().mId, UniversalId(GetParam().mId));
+        }
+
+        TEST_P(CSMWorldUniversalIdValidPerTypeTest, shouldNotBeLessThanCopy)
+        {
+            EXPECT_FALSE(GetParam().mId < UniversalId(GetParam().mId));
+        }
+
+        TEST_P(CSMWorldUniversalIdValidPerTypeTest, getTypeNameShouldReturnExpected)
+        {
+            EXPECT_EQ(GetParam().mId.getTypeName(), GetParam().mTypeName);
+        }
+
+        TEST_P(CSMWorldUniversalIdValidPerTypeTest, toStringShouldReturnExpected)
+        {
+            EXPECT_EQ(GetParam().mId.toString(), GetParam().mString);
+        }
+
+        TEST_P(CSMWorldUniversalIdValidPerTypeTest, getIconShouldReturnExpected)
+        {
+            EXPECT_EQ(GetParam().mId.getIcon(), GetParam().mIcon);
+        }
+
+        const std::array validParams = {
+            Params{ UniversalId(), UniversalId::Type_None, UniversalId::Class_None, UniversalId::ArgumentType_None, "-",
+                "-", ":placeholder" },
+
+            Params{ UniversalId(UniversalId::Type_None), UniversalId::Type_None, UniversalId::Class_None,
+                UniversalId::ArgumentType_None, "-", "-", ":placeholder" },
+            Params{ UniversalId(UniversalId::Type_RegionMap), UniversalId::Type_RegionMap, UniversalId::Class_NonRecord,
+                UniversalId::ArgumentType_None, "Region Map", "Region Map", ":./region-map.png" },
+            Params{ UniversalId(UniversalId::Type_RunLog), UniversalId::Type_RunLog, UniversalId::Class_Transient,
+                UniversalId::ArgumentType_None, "Run Log", "Run Log", ":./run-log.png" },
+            Params{ UniversalId(UniversalId::Type_Lands), UniversalId::Type_Lands, UniversalId::Class_RecordList,
+                UniversalId::ArgumentType_None, "Lands", "Lands", ":./land-heightmap.png" },
+            Params{ UniversalId(UniversalId::Type_Icons), UniversalId::Type_Icons, UniversalId::Class_ResourceList,
+                UniversalId::ArgumentType_None, "Icons", "Icons", ":./resources-icon" },
+
+            Params{ UniversalId(UniversalId::Type_Activator, "a"), UniversalId::Type_Activator,
+                UniversalId::Class_RefRecord, UniversalId::ArgumentType_Id, "Activator", "Activator: a",
+                ":./activator.png" },
+            Params{ UniversalId(UniversalId::Type_Gmst, "b"), UniversalId::Type_Gmst, UniversalId::Class_Record,
+                UniversalId::ArgumentType_Id, "Game Setting", "Game Setting: b", ":./gmst.png" },
+            Params{ UniversalId(UniversalId::Type_Mesh, "c"), UniversalId::Type_Mesh, UniversalId::Class_Resource,
+                UniversalId::ArgumentType_Id, "Mesh", "Mesh: c", ":./resources-mesh" },
+            Params{ UniversalId(UniversalId::Type_Scene, "d"), UniversalId::Type_Scene, UniversalId::Class_Collection,
+                UniversalId::ArgumentType_Id, "Scene", "Scene: d", ":./scene.png" },
+            Params{ UniversalId(UniversalId::Type_Reference, "e"), UniversalId::Type_Reference,
+                UniversalId::Class_SubRecord, UniversalId::ArgumentType_Id, "Instance", "Instance: e",
+                ":./instance.png" },
+
+            Params{ UniversalId(UniversalId::Type_Search, 42), UniversalId::Type_Search, UniversalId::Class_Transient,
+                UniversalId::ArgumentType_Index, "Global Search", "Global Search: 42", ":./menu-search.png" },
+
+            Params{ UniversalId("Instance: f"), UniversalId::Type_Reference, UniversalId::Class_SubRecord,
+                UniversalId::ArgumentType_Id, "Instance", "Instance: f", ":./instance.png" },
+        };
+
+        INSTANTIATE_TEST_SUITE_P(ValidParams, CSMWorldUniversalIdValidPerTypeTest, ValuesIn(validParams));
+    }
+}