diff --git a/racevisionGame/src/test/java/network/BinaryMessageDecoderTest.java b/racevisionGame/src/test/java/network/BinaryMessageDecoderTest.java
index c7c843e5..55ac00be 100644
--- a/racevisionGame/src/test/java/network/BinaryMessageDecoderTest.java
+++ b/racevisionGame/src/test/java/network/BinaryMessageDecoderTest.java
@@ -29,6 +29,7 @@ public class BinaryMessageDecoderTest {
 
     /**
      * Tests if an XMLMessage can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void xmlMessageTest() throws Exception {
diff --git a/racevisionGame/src/test/java/network/MessageDecoders/BoatActionDecoderTest.java b/racevisionGame/src/test/java/network/MessageDecoders/BoatActionDecoderTest.java
index 1a16f669..d7e13b97 100644
--- a/racevisionGame/src/test/java/network/MessageDecoders/BoatActionDecoderTest.java
+++ b/racevisionGame/src/test/java/network/MessageDecoders/BoatActionDecoderTest.java
@@ -21,6 +21,7 @@ public class BoatActionDecoderTest {
      * Encodes and decodes a given message.
      * @param message Message to encode/decode.
      * @return The decoded message.
+     * @throws InvalidMessageException If the message cannot be encoded.
      */
     private BoatAction encodeDecodeMessage(BoatAction message) throws InvalidMessageException {
 
@@ -40,6 +41,7 @@ public class BoatActionDecoderTest {
     /**
      * Tests if a specific boat action type message can be encoded and decoded correctly.
      * @param type The type of boat action.
+     * @throws Exception if test fails.
      */
     private void boatActionTypeTest(BoatActionEnum type) throws Exception {
 
@@ -59,6 +61,7 @@ public class BoatActionDecoderTest {
 
     /**
      * Tests if an autopilot message can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void autoPilotTest() throws Exception {
@@ -67,6 +70,7 @@ public class BoatActionDecoderTest {
 
     /**
      * Tests if a sails in message can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void sailsInTest() throws Exception {
@@ -75,6 +79,7 @@ public class BoatActionDecoderTest {
 
     /**
      * Tests if a sails out message can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void sailsOutTest() throws Exception {
@@ -83,6 +88,7 @@ public class BoatActionDecoderTest {
 
     /**
      * Tests if a tack/gybe message can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void tackGybeTest() throws Exception {
@@ -91,6 +97,7 @@ public class BoatActionDecoderTest {
 
     /**
      * Tests if an upwind message can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void upwindTest() throws Exception {
@@ -99,6 +106,7 @@ public class BoatActionDecoderTest {
 
     /**
      * Tests if a downwind message can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void downwindTest() throws Exception {
diff --git a/racevisionGame/src/test/java/network/MessageDecoders/BoatLocationDecoderTest.java b/racevisionGame/src/test/java/network/MessageDecoders/BoatLocationDecoderTest.java
index 22831eaa..05964aaf 100644
--- a/racevisionGame/src/test/java/network/MessageDecoders/BoatLocationDecoderTest.java
+++ b/racevisionGame/src/test/java/network/MessageDecoders/BoatLocationDecoderTest.java
@@ -14,6 +14,7 @@ public class BoatLocationDecoderTest {
 
     /**
      * Creates a BoatLocation message, encodes it, decodes it, and checks that the result matches the starting message.
+     * @throws Exception if test fails.
      */
     @Test
     public void boatLocationEncodeDecodeTest() throws Exception {
diff --git a/racevisionGame/src/test/java/network/MessageDecoders/HeartBeatDecoderTest.java b/racevisionGame/src/test/java/network/MessageDecoders/HeartBeatDecoderTest.java
index ca1086e7..778a667a 100644
--- a/racevisionGame/src/test/java/network/MessageDecoders/HeartBeatDecoderTest.java
+++ b/racevisionGame/src/test/java/network/MessageDecoders/HeartBeatDecoderTest.java
@@ -20,6 +20,7 @@ public class HeartBeatDecoderTest {
      * Encodes and decodes a given message.
      * @param message Message to encode/decode.
      * @return The decoded message.
+     * @throws InvalidMessageException if the message cannot be encoded.
      */
     private HeartBeat encodeDecodeMessage(HeartBeat message) throws InvalidMessageException {
 
@@ -37,6 +38,7 @@ public class HeartBeatDecoderTest {
     /**
      * Tests if a heartbeat message with a given sequence number can be encoded and decoded correctly.
      * @param sequenceNumber The sequenceNumber to use.
+     * @throws Exception if test fails.
      */
     private void heartBeatTest(long sequenceNumber) throws Exception {
 
@@ -56,6 +58,7 @@ public class HeartBeatDecoderTest {
 
     /**
      * Tests if a heartbeat message with a sequence number of zero can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void heartBeatZeroTest() throws Exception {
@@ -64,6 +67,7 @@ public class HeartBeatDecoderTest {
 
     /**
      * Tests if a heartbeat message with a sequence number of 1234512 can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void heartBeatNonZeroTest() throws Exception {
diff --git a/racevisionGame/src/test/java/network/MessageDecoders/JoinAcceptanceDecoderTest.java b/racevisionGame/src/test/java/network/MessageDecoders/JoinAcceptanceDecoderTest.java
index 5cefe5ea..cd31ad67 100644
--- a/racevisionGame/src/test/java/network/MessageDecoders/JoinAcceptanceDecoderTest.java
+++ b/racevisionGame/src/test/java/network/MessageDecoders/JoinAcceptanceDecoderTest.java
@@ -19,6 +19,7 @@ public class JoinAcceptanceDecoderTest {
      * Encodes and decodes a given message.
      * @param message Message to encode/decode.
      * @return The decoded message.
+     * @throws InvalidMessageException If the message cannot be encoded.
      */
     private JoinAcceptance encodeDecodeMessage(JoinAcceptance message) throws InvalidMessageException {
 
@@ -37,6 +38,7 @@ public class JoinAcceptanceDecoderTest {
      * Tests if a specific acceptance type message can be encoded and decoded correctly.
      * @param type The type of acceptance response.
      * @param sourceID The source ID to assign.
+     * @throws Exception if test fails.
      */
     private void responseTypeTest(JoinAcceptanceEnum type, int sourceID) throws Exception {
 
@@ -57,6 +59,7 @@ public class JoinAcceptanceDecoderTest {
 
     /**
      * Tests if a join success message, with a source ID, can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void joinSuccessSourceIDTest() throws Exception {
@@ -65,6 +68,7 @@ public class JoinAcceptanceDecoderTest {
 
     /**
      * Tests if a join success message, with no source ID, can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void joinSuccessNoSourceIDTest() throws Exception {
@@ -73,6 +77,7 @@ public class JoinAcceptanceDecoderTest {
 
     /**
      * Tests if a participants full message can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void participantFullTest() throws Exception {
@@ -81,6 +86,7 @@ public class JoinAcceptanceDecoderTest {
 
     /**
      * Tests if a ghosts full message can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void ghostFullTest() throws Exception {
@@ -89,6 +95,7 @@ public class JoinAcceptanceDecoderTest {
 
     /**
      * Tests if a server full message can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void serverFullTest() throws Exception {
diff --git a/racevisionGame/src/test/java/network/MessageDecoders/RequestToJoinDecoderTest.java b/racevisionGame/src/test/java/network/MessageDecoders/RequestToJoinDecoderTest.java
index ddfd11bd..bde4ae75 100644
--- a/racevisionGame/src/test/java/network/MessageDecoders/RequestToJoinDecoderTest.java
+++ b/racevisionGame/src/test/java/network/MessageDecoders/RequestToJoinDecoderTest.java
@@ -20,6 +20,7 @@ public class RequestToJoinDecoderTest {
      * Encodes and decodes a given message.
      * @param message Message to encode/decode.
      * @return The decoded message.
+     * @throws InvalidMessageException If the message cannot be encoded.
      */
     private RequestToJoin encodeDecodeMessage(RequestToJoin message) throws InvalidMessageException {
 
@@ -37,6 +38,7 @@ public class RequestToJoinDecoderTest {
     /**
      * Tests if a specific request type message can be encoded and decoded correctly.
      * @param type The type of join request.
+     * @throws Exception if test fails.
      */
     private void requestTypeTest(RequestToJoinEnum type) throws Exception {
 
@@ -56,6 +58,7 @@ public class RequestToJoinDecoderTest {
 
     /**
      * Tests if a spectator request message can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void spectatorTest() throws Exception {
@@ -64,6 +67,7 @@ public class RequestToJoinDecoderTest {
 
     /**
      * Tests if a participant request message can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void participantTest() throws Exception {
@@ -72,6 +76,7 @@ public class RequestToJoinDecoderTest {
 
     /**
      * Tests if a ghost request message can be encoded and decoded correctly.
+     * @throws Exception if test fails.
      */
     @Test
     public void ghostTest() throws Exception {
diff --git a/racevisionGame/src/test/java/network/MessageDecoders/XMLMessageDecoderTest.java b/racevisionGame/src/test/java/network/MessageDecoders/XMLMessageDecoderTest.java
index fb0683a3..32d1a61e 100644
--- a/racevisionGame/src/test/java/network/MessageDecoders/XMLMessageDecoderTest.java
+++ b/racevisionGame/src/test/java/network/MessageDecoders/XMLMessageDecoderTest.java
@@ -77,6 +77,7 @@ public class XMLMessageDecoderTest {
 
     /**
      * Tests if a regatta.xml message can be encoded and decoded.
+     * @throws Exception if test fails.
      */
     @Test
     public void regattaXMLMessageTest() throws Exception {
@@ -86,6 +87,7 @@ public class XMLMessageDecoderTest {
 
     /**
      * Tests if a race.xml message can be encoded and decoded.
+     * @throws Exception if test fails.
      */
     @Test
     public void raceXMLMessageTest() throws Exception {
@@ -95,6 +97,7 @@ public class XMLMessageDecoderTest {
 
     /**
      * Tests if a boat.xml message can be encoded and decoded.
+     * @throws Exception if test fails.
      */
     @Test
     public void boatXMLMessageTest() throws Exception {