diff --git a/source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp
index 9c29804ebdc56444b175b3de0abd115b3a1067c0..8cb721c4b724e0c6f307a6ee6b796c01c974680a 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp
@@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE(test_forEach)
                 eids.insert(eid);
                 for (size_t s = 0; s <= e; ++s)
                 {
-                    const MemoryID sid = eid.withTimestamp(Time::microSeconds(int(s)));
+                    const MemoryID sid = eid.withTimestamp(Time(Duration::MicroSeconds(int(s))));
                     sids.insert(sid);
 
                     EntityUpdate update;
@@ -176,8 +176,8 @@ BOOST_AUTO_TEST_CASE(test_forEach_non_bool_func)
     // Check whether this compiles + runs without break.
 
     armem::wm::Entity entity;
-    entity.addSnapshot(armem::Time::microSeconds(500));
-    entity.addSnapshot(armem::Time::microSeconds(1500));
+    entity.addSnapshot(armem::Time(armem::Duration::MicroSeconds(500)));
+    entity.addSnapshot(armem::Time(armem::Duration::MicroSeconds(1500)));
 
     int i = 0;
     entity.forEachSnapshot([&i](const armem::wm::EntitySnapshot&) -> void
diff --git a/source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp
index 29c12884d15292706ac2be33410352fe832dbc2a..f03b02052ef9956aab079dda96677acaf5aca48d 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp
@@ -58,7 +58,7 @@ namespace ArMemGetFindTest
         Fixture()
         {
             {
-                snapshot.time() = armem::Time::microSeconds(1000);
+                snapshot.time() = armem::Time(armem::Duration::MicroSeconds(1000));
                 snapshot.addInstance();
             }
             {
@@ -123,14 +123,14 @@ namespace ArMemGetFindTest
         {
             BOOST_TEST_CONTEXT("Parent: " << armem::print(parent))
             {
-                BOOST_CHECK_EQUAL(parent.hasSnapshot(entityID.withTimestamp(armem::Time::microSeconds(1000))), true);
-                BOOST_CHECK_EQUAL(parent.hasSnapshot(entityID.withTimestamp(armem::Time::microSeconds(2000))), false);
+                BOOST_CHECK_EQUAL(parent.hasSnapshot(entityID.withTimestamp(armem::Time(armem::Duration::MicroSeconds(1000)))), true);
+                BOOST_CHECK_EQUAL(parent.hasSnapshot(entityID.withTimestamp(armem::Time(armem::Duration::MicroSeconds(2000)))), false);
 
-                BOOST_CHECK_NE(parent.findSnapshot(entityID.withTimestamp(armem::Time::microSeconds(1000))), nullptr);
-                BOOST_CHECK_EQUAL(parent.findSnapshot(entityID.withTimestamp(armem::Time::microSeconds(2000))), nullptr);
+                BOOST_CHECK_NE(parent.findSnapshot(entityID.withTimestamp(armem::Time(armem::Duration::MicroSeconds(1000)))), nullptr);
+                BOOST_CHECK_EQUAL(parent.findSnapshot(entityID.withTimestamp(armem::Time(armem::Duration::MicroSeconds(2000)))), nullptr);
 
-                BOOST_CHECK_NO_THROW(parent.getSnapshot(entityID.withTimestamp(armem::Time::microSeconds(1000))));
-                BOOST_CHECK_THROW(parent.getSnapshot(entityID.withTimestamp(armem::Time::microSeconds(2000))), armem::error::MissingEntry);
+                BOOST_CHECK_NO_THROW(parent.getSnapshot(entityID.withTimestamp(armem::Time(armem::Duration::MicroSeconds(1000)))));
+                BOOST_CHECK_THROW(parent.getSnapshot(entityID.withTimestamp(armem::Time(armem::Duration::MicroSeconds(2000)))), armem::error::MissingEntry);
             }
         }
 
@@ -223,14 +223,14 @@ BOOST_AUTO_TEST_CASE(test_snapshot_get_find_instance_by_key)
 
 BOOST_AUTO_TEST_CASE(test_entity_get_find_snapshot_by_key)
 {
-    BOOST_CHECK_EQUAL(entity.hasSnapshot(armem::Time::microSeconds(1000)), true);
-    BOOST_CHECK_EQUAL(entity.hasSnapshot(armem::Time::microSeconds(2000)), false);
+    BOOST_CHECK_EQUAL(entity.hasSnapshot(armem::Time(armem::Duration::MicroSeconds(1000))), true);
+    BOOST_CHECK_EQUAL(entity.hasSnapshot(armem::Time(armem::Duration::MicroSeconds(2000))), false);
 
-    BOOST_CHECK_NE(entity.findSnapshot(armem::Time::microSeconds(1000)), nullptr);
-    BOOST_CHECK_EQUAL(entity.findSnapshot(armem::Time::microSeconds(2000)), nullptr);
+    BOOST_CHECK_NE(entity.findSnapshot(armem::Time(armem::Duration::MicroSeconds(1000))), nullptr);
+    BOOST_CHECK_EQUAL(entity.findSnapshot(armem::Time(armem::Duration::MicroSeconds(2000))), nullptr);
 
-    BOOST_CHECK_NO_THROW(entity.getSnapshot(armem::Time::microSeconds(1000)));
-    BOOST_CHECK_THROW(entity.getSnapshot(armem::Time::microSeconds(2000)), armem::error::MissingEntry);
+    BOOST_CHECK_NO_THROW(entity.getSnapshot(armem::Time(armem::Duration::MicroSeconds(1000))));
+    BOOST_CHECK_THROW(entity.getSnapshot(armem::Time(armem::Duration::MicroSeconds(2000))), armem::error::MissingEntry);
 }
 
 
diff --git a/source/RobotAPI/libraries/armem/test/ArMemIceConversionsTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemIceConversionsTest.cpp
index 9fd00a4cf944f50cbd1c0d7bd06b9b56d812c161..a556ef11aeebe4c92b744e35eff6511652acd531 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemIceConversionsTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemIceConversionsTest.cpp
@@ -27,7 +27,6 @@
 #include <RobotAPI/Test.h>
 #include <RobotAPI/libraries/armem/core/wm/ice_conversions.h>
 
-
 #include <iostream>
 #include <SimoxUtility/algorithm/get_map_keys_values.h>
 
@@ -43,11 +42,11 @@ BOOST_AUTO_TEST_CASE(test_entity)
     std::vector<armem::Time> expectedTimestamps;
 
     armem::wm::EntitySnapshot snapshot;
-    snapshot.time() = armem::Time::milliSeconds(100);
+    snapshot.time() = armem::Time(armem::Duration::MicroSeconds(100));
     expectedTimestamps.push_back(snapshot.time());
     entity.addSnapshot(snapshot);
 
-    snapshot.time() = armem::Time::milliSeconds(300);
+    snapshot.time() = armem::Time(armem::Duration::MicroSeconds(300));
     expectedTimestamps.push_back(snapshot.time());
     entity.addSnapshot(snapshot);
 
diff --git a/source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp
index 72f09fb225aa22b50ed55a9482e7f973acbf0fd2..987cf20c980e0478056dd529d4ad877de2499ba4 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE(test_MemoryID_from_to_string)
     BOOST_CHECK_EQUAL(idIn.coreSegmentName, "Core");
     BOOST_CHECK_EQUAL(idIn.providerSegmentName, "Prov");
     BOOST_CHECK_EQUAL(idIn.entityName, "entity");
-    BOOST_CHECK_EQUAL(idIn.timestamp, IceUtil::Time::microSeconds(2810381));
+    BOOST_CHECK_EQUAL(idIn.timestamp, armem::Time(armem::Duration::MicroSeconds(2810381)));
     BOOST_CHECK_EQUAL(idIn.instanceIndex, 2);
 
 
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE(test_MemoryID_from_to_string)
     BOOST_CHECK_EQUAL(idIn.coreSegmentName, "AtTheEnd/");
     BOOST_CHECK_EQUAL(idIn.providerSegmentName, "/AtTheStart");
     BOOST_CHECK_EQUAL(idIn.entityName, "YCB/sugar/-1");
-    BOOST_CHECK_EQUAL(idIn.timestamp, IceUtil::Time::microSeconds(-1));
+    BOOST_CHECK_EQUAL(idIn.timestamp, armem::Time::Invalid());
     BOOST_CHECK_EQUAL(idIn.instanceIndex, 2);
 
     BOOST_TEST_CONTEXT(VAROUT(idIn.str()))
@@ -134,7 +134,6 @@ BOOST_AUTO_TEST_CASE(test_MemoryID_from_to_string)
         armem::MemoryID idOut(idIn.str());
         BOOST_CHECK_EQUAL(idOut, idIn);
     }
-
 }
 
 
diff --git a/source/RobotAPI/libraries/armem/test/ArMemQueryBuilderTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemQueryBuilderTest.cpp
index 78d3077c082e41f32bf6dfd398e9e7d474e19dc3..9594291703d93c58585174cddcb991f3a1720b38 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemQueryBuilderTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemQueryBuilderTest.cpp
@@ -97,9 +97,10 @@ BOOST_AUTO_TEST_CASE(test_mixed)
     .entities(withName(entityNames.at(0)),
               withName(entityNames.at(1)))
     .snapshots(latest(),
-               atTime(armem::Time::milliSeconds(3000)),
+               atTime(armem::Time(armem::Duration::MilliSeconds(3000))),
                indexRange(5, -10),
-               timeRange(armem::Time::milliSeconds(1000), armem::Time::milliSeconds(2000)))
+               timeRange(armem::Time(armem::Duration::MilliSeconds(1000)),
+                         armem::Time(armem::Duration::MilliSeconds(2000))))
     ;
 
 
@@ -144,7 +145,7 @@ BOOST_AUTO_TEST_CASE(test_mixed)
         {
             auto atTime = query::entity::SinglePtr::dynamicCast(*it);
             BOOST_REQUIRE(atTime);
-            BOOST_CHECK_EQUAL(atTime->timestamp, armem::toIce<long>(armem::Time::milliSeconds(3000)));
+            BOOST_CHECK_EQUAL(atTime->timestamp, armem::toIce<long>(armem::Time(armem::Duration::MilliSeconds(3000))));
             ++it;
         }
         {
@@ -157,12 +158,11 @@ BOOST_AUTO_TEST_CASE(test_mixed)
         {
             auto timeRange = query::entity::TimeRangePtr::dynamicCast(*it);
             BOOST_REQUIRE(timeRange);
-            BOOST_CHECK_EQUAL(timeRange->minTimestamp, armem::toIce<long>(armem::Time::milliSeconds(1000)));
-            BOOST_CHECK_EQUAL(timeRange->maxTimestamp, armem::toIce<long>(armem::Time::milliSeconds(2000)));
+            BOOST_CHECK_EQUAL(timeRange->minTimestamp, armem::toIce<long>(armem::Time(armem::Duration::MilliSeconds(1000))));
+            BOOST_CHECK_EQUAL(timeRange->maxTimestamp, armem::toIce<long>(armem::Time(armem::Duration::MilliSeconds(2000))));
             ++it;
         }
     }
-
 }