diff --git a/src/test/java/appeng/util/helpers/P2PHelperTest.java b/src/test/java/appeng/util/helpers/P2PHelperTest.java
new file mode 100644
index 00000000..d09fbdb4
--- /dev/null
+++ b/src/test/java/appeng/util/helpers/P2PHelperTest.java
@@ -0,0 +1,68 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.util.helpers;
+
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import appeng.api.util.AEColor;
+
+
+public class P2PHelperTest
+{
+
+	private P2PHelper unitUnderTest = new P2PHelper();
+
+	private static short WHITE_FREQUENCY = 0;
+	private static AEColor[] WHITE_COLOURS = new AEColor[] { AEColor.WHITE, AEColor.WHITE, AEColor.WHITE, AEColor.WHITE };
+
+	private static short BLACK_FREQUENCY = (short) 0xFFFF;
+	private static AEColor[] BLACK_COLOURS = new AEColor[] { AEColor.BLACK, AEColor.BLACK, AEColor.BLACK, AEColor.BLACK };
+
+	private static short MULTI_FREQUENCY = (short) -5935;
+	private static AEColor[] MULTI_COLOURS = new AEColor[] { AEColor.RED, AEColor.LIGHT_GRAY, AEColor.GREEN, AEColor.ORANGE };
+
+	@Test
+	public void testToColours()
+	{
+		assertArrayEquals( WHITE_COLOURS, unitUnderTest.toColours( WHITE_FREQUENCY ) );
+		assertArrayEquals( BLACK_COLOURS, unitUnderTest.toColours( BLACK_FREQUENCY ) );
+		assertArrayEquals( MULTI_COLOURS, unitUnderTest.toColours( MULTI_FREQUENCY ) );
+	}
+
+	@Test
+	public void testFromColours()
+	{
+		assertEquals( WHITE_FREQUENCY, unitUnderTest.fromColours( WHITE_COLOURS ) );
+		assertEquals( BLACK_FREQUENCY, unitUnderTest.fromColours( BLACK_COLOURS ) );
+		assertEquals( MULTI_FREQUENCY, unitUnderTest.fromColours( MULTI_COLOURS ) );
+	}
+
+	@Test
+	public void testToAndFromColours()
+	{
+		for( short i = Short.MIN_VALUE; i < Short.MAX_VALUE; i++ )
+		{
+			assertEquals( i, unitUnderTest.fromColours( unitUnderTest.toColours( i ) ) );
+		}
+	}
+
+}