diff --git a/orange-backend/src/main/java/com/netbuilder/controllers/WishlistController.java b/orange-backend/src/main/java/com/netbuilder/controllers/WishlistController.java
@@ -7,6 +7,9 @@
 import javax.faces.context.FacesContext;
 import javax.inject.Inject;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import com.netbuilder.entities.LoginDetails;
 import com.netbuilder.entities.Order;
 import com.netbuilder.entities.OrderLine;
@@ -48,7 +51,8 @@ public class WishlistController
 	private Order orderBasket;
 	private String emptyWishlist = "";
 
-
+	private static final Logger logger = LogManager.getLogger();
+
 	private List<OrderLine> wishlist;
 
 	public List<OrderLine> getWishlist() 
@@ -87,11 +91,13 @@ public void removeFromWishlist()
 			} 
 			else 
 			{
+				logger.info("WishlistController::Line80:: Wishlist does not contain said item.");
 				System.out.println("WishlistController::Line80:: Wishlist does not contain said item.");
 			}
 		} 
 		else 
 		{
+			logger.info("WishlistController::Line80:: Wishlist does not contain said item.");
 			System.out.println("WishlistController::Line85:: Cannot find user wishlist.");
 		}
 	}

diff --git a/orange-backend/src/main/java/com/netbuilder/persistence_manager/PersistenceManager.java b/orange-backend/src/main/java/com/netbuilder/persistence_manager/PersistenceManager.java
@@ -6,6 +6,9 @@
 import javax.persistence.Persistence;
 import javax.persistence.PersistenceException;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 /**
  * 
  * @author JustinMabbutt
@@ -14,6 +17,7 @@
 
 @Singleton
 public class PersistenceManager {
+	private static final Logger logger = LogManager.getLogger();
 	private EntityManagerFactory emf;
 
 	public EntityManager createEntityManager() {
@@ -22,6 +26,7 @@ public EntityManager createEntityManager() {
 			EntityManager em = emf.createEntityManager();
 			return em;
 		} catch (PersistenceException pe) {
+			logger.error("Persistence error", emf);
 			pe.printStackTrace();
 			return null;
 		}

diff --git a/orange-backend/src/test/java/entity_managersAL_tests/CustomerManagerALTest.java b/orange-backend/src/test/java/entity_managersAL_tests/CustomerManagerALTest.java
@@ -9,9 +9,7 @@
 import org.junit.Test;
 
 import com.netbuilder.entities.Customer;
-import com.netbuilder.entities.LoginDetails;
 import com.netbuilder.entity_managers.arraylist.CustomerManagerAL;
-import com.netbuilder.entity_managers.arraylist.LoginDetailsManagerAL;
 
 /**
  * 

diff --git a/orange-backend/src/test/java/entity_managersAL_tests/DeliveryManagerALTest.java b/orange-backend/src/test/java/entity_managersAL_tests/DeliveryManagerALTest.java
@@ -12,7 +12,6 @@
 
 import com.netbuilder.entities.Delivery;
 import com.netbuilder.entity_managers.arraylist.DeliveryManagerAL;
-import com.netbuilder.enums.DeliveryStatus;
 
 /**
  * 
@@ -23,15 +22,13 @@
 public class DeliveryManagerALTest {
 
 	private Delivery testDelivery, testDelivery2, testDelivery3, testDelivery4;
-	private DeliveryStatus deliveryStatus;
 	private DeliveryManagerAL deliveryManager;
 	private List<Delivery> testArrayDelivery, testArrayDelivery2;
 
 	@Before
 	public void setUp() throws Exception {
 
 		deliveryManager = new DeliveryManagerAL();
-		deliveryStatus = DeliveryStatus.Processing;
 		testDelivery = new Delivery("AB/BC/CDEF", "BC/DE/EFGH", "Gnome Depot",
 				new BigDecimal(110.5));
 		testDelivery2 = new Delivery("14/04/2015", "17/05/2015",

diff --git a/orange-backend/src/test/java/entity_managersAL_tests/OrderLineManagerALTest.java b/orange-backend/src/test/java/entity_managersAL_tests/OrderLineManagerALTest.java
@@ -15,8 +15,6 @@
 import com.netbuilder.entities.Product;
 import com.netbuilder.entity_managers.arraylist.OrderLineManagerAL;
 import com.netbuilder.enums.CardType;
-import com.netbuilder.enums.EmployeeDepartment;
-import com.netbuilder.enums.EmployeePermissions;
 import com.netbuilder.enums.OrderStatus;
 import com.netbuilder.enums.ProductCategory;