diff --git a/Plugins[Modified]/Mineplex.Core/test/mineplex/core/lifetimes/LoggingComponent.java b/Plugins[Modified]/Mineplex.Core/test/mineplex/core/lifetimes/LoggingComponent.java
deleted file mode 100644
index d2f61d53..00000000
--- a/Plugins[Modified]/Mineplex.Core/test/mineplex/core/lifetimes/LoggingComponent.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package mineplex.core.lifetimes;
-
-import java.util.List;
-
-public class LoggingComponent implements PhasedComponent {
-	private final List<String> _events;
-	private final String _name;
-
-	public LoggingComponent(List<String> events, String name)
-	{
-		_events = events;
-		this._name = name;
-	}
-
-	@Override
-	public void activate()
-	{
-		_events.add(this._name + " activated");
-	}
-
-	@Override
-	public void deactivate()
-	{
-		_events.add(this._name + " deactivated");
-	}
-
-	@Override
-	public void setPhase(Object phase)
-	{
-		_events.add(this._name + " setPhase " + phase);
-	}
-}
\ No newline at end of file
diff --git a/Plugins[Modified]/Mineplex.Core/test/mineplex/core/lifetimes/PhasedLifetimeTest.java b/Plugins[Modified]/Mineplex.Core/test/mineplex/core/lifetimes/PhasedLifetimeTest.java
deleted file mode 100644
index 3d62001c..00000000
--- a/Plugins[Modified]/Mineplex.Core/test/mineplex/core/lifetimes/PhasedLifetimeTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package mineplex.core.lifetimes;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-public class PhasedLifetimeTest
-{
-	PhasedLifetime<Phase> _lifetime = new PhasedLifetime<>();
-	List<String> _events = new ArrayList<>();
-	@Test
-	public void testTwoPhaseComponent()
-	{
-		Assert.assertFalse(_lifetime.isActive());
-		_lifetime.register(new LoggingComponent(_events, "component"), Arrays.asList(Phase.A, Phase.B));
-		_lifetime.start(Phase.A);
-		Assert.assertTrue(_lifetime.isActive());
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase A"), _events);
-		_lifetime.setPhase(Phase.B);
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase A", "component setPhase B"), _events);
-		_lifetime.setPhase(Phase.C);
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase A", "component setPhase B", "component setPhase C", "component deactivated"), _events);
-		_lifetime.end();
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase A", "component setPhase B", "component setPhase C", "component deactivated"), _events);
-		Assert.assertFalse(_lifetime.isActive());
-	}
-	@Test
-	public void testGlobalComponent()
-	{
-		_lifetime.register(new LoggingComponent(_events, "component"));
-		_lifetime.start(Phase.A);
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase A"), _events);
-		_lifetime.setPhase(Phase.B);
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase A", "component setPhase B"), _events);
-		_lifetime.end();
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase A", "component setPhase B", "component deactivated"), _events);
-	}
-
-	@Test
-	public void testLateRegistration()
-	{
-		_lifetime.start(Phase.A);
-		_lifetime.register(new LoggingComponent(_events, "component"), Arrays.asList(Phase.A, Phase.B));
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase A"), _events);
-		_lifetime.setPhase(Phase.B);
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase A", "component setPhase B"), _events);
-		_lifetime.end();
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase A", "component setPhase B", "component deactivated"), _events);
-	}
-	@Test
-	public void testSinglePhase()
-	{
-		_lifetime.register(new LoggingComponent(_events, "component"), Collections.singletonList(Phase.B));
-		_lifetime.start(Phase.A);
-		Assert.assertEquals(Collections.emptyList(), _events);
-		_lifetime.setPhase(Phase.B);
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase B"), _events);
-		_lifetime.setPhase(Phase.C);
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase B", "component setPhase C", "component deactivated"), _events);
-		_lifetime.end();
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase B", "component setPhase C", "component deactivated"), _events);
-	}
-	@Test
-	public void testComponentLifetimes()
-	{
-		_lifetime.register(new LoggingComponent(_events, "component"), Collections.singletonList(Phase.B)).register(new LoggingComponent(_events, "child"));
-		_lifetime.start(Phase.A);
-		Assert.assertEquals(Collections.emptyList(), _events);
-		_lifetime.setPhase(Phase.B);
-		Assert.assertEquals(Arrays.asList("component activated", "child activated", "component setPhase B"), _events);
-		_lifetime.setPhase(Phase.C);
-		Assert.assertEquals(Arrays.asList("component activated", "child activated","component setPhase B",  "component setPhase C", "child deactivated", "component deactivated"), _events);
-		_lifetime.end();
-		Assert.assertEquals(Arrays.asList("component activated", "child activated", "component setPhase B", "component setPhase C", "child deactivated", "component deactivated"), _events);
-	}
-	@Test
-	public void testEarlyShutdown()
-	{
-		_lifetime.register(new LoggingComponent(_events, "component"), Arrays.asList(Phase.B, Phase.C));
-		_lifetime.start(Phase.A);
-		Assert.assertEquals(Collections.emptyList(), _events);
-		_lifetime.setPhase(Phase.B);
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase B"), _events);
-		_lifetime.end();
-		Assert.assertEquals(Arrays.asList("component activated", "component setPhase B", "component deactivated"), _events);
-
-	}
-	enum Phase
-	{
-		A,
-		B,
-		C,
-		;
-	}
-}
diff --git a/Plugins[Modified]/Mineplex.Core/test/mineplex/core/lifetimes/SimpleLifetimeTest.java b/Plugins[Modified]/Mineplex.Core/test/mineplex/core/lifetimes/SimpleLifetimeTest.java
deleted file mode 100644
index 061a1dec..00000000
--- a/Plugins[Modified]/Mineplex.Core/test/mineplex/core/lifetimes/SimpleLifetimeTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package mineplex.core.lifetimes;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class SimpleLifetimeTest
-{
-	private final SimpleLifetime _lifetime = new SimpleLifetime();
-	private final List<String> _events = new ArrayList<>();
-	@Test
-	public void testAddition()
-	{
-		_lifetime.register(new LoggingComponent(_events,"a"));
-		_lifetime.start();
-		_lifetime.end();
-		Assert.assertEquals(_events, Arrays.asList("a activated", "a deactivated"));
-	}
-	@Test
-	public void testLateAddition()
-	{
-		_lifetime.start();
-		_lifetime.register(new LoggingComponent(_events,"a"));
-		_lifetime.end();
-		Assert.assertEquals(_events, Arrays.asList("a activated", "a deactivated"));
-	}
-	@Test
-	public void testActivationOrder()
-	{
-		_lifetime.register(new LoggingComponent(_events,"a"));
-		_lifetime.register(new LoggingComponent(_events,"b"));
-		_lifetime.start();
-		_lifetime.end();
-		Assert.assertEquals(_events, Arrays.asList("a activated", "b activated", "b deactivated", "a deactivated"));
-	}
-
-
-}