diff --git a/src/main/java/controllers/MainController.java b/src/main/java/controllers/MainController.java
index 23cc980..738ac4c 100644
--- a/src/main/java/controllers/MainController.java
+++ b/src/main/java/controllers/MainController.java
@@ -21,8 +21,8 @@ public class MainController extends Controller{
     @FXML
     PasswordField password;
 
-    public boolean validateLogin(){
-        if (username.getText().equals(password.getText())){
+    public boolean validateLogin(String user, String pass){
+        if (user.equals(pass)){
             return true;
         }
         return false;
@@ -30,7 +30,7 @@ public class MainController extends Controller{
 
     public void login() throws Exception {
         //validate login
-        if (validateLogin()){
+        if (validateLogin(username.getText(), password.getText())){
             parent.getSession().setUserCode(username.getText());
             changeScene(SceneCode.HOME);
         }else{
diff --git a/src/main/java/model/DataManager.java b/src/main/java/model/DataManager.java
index 7fc4817..addba08 100644
--- a/src/main/java/model/DataManager.java
+++ b/src/main/java/model/DataManager.java
@@ -21,10 +21,6 @@ public class DataManager {
         return rides;
     }
 
-    public void setRides(ObservableList<Ride> rides) {
-        this.rides = rides;
-    }
-
     public void addRides(Ride ride){
         rides.add(ride);
     }
diff --git a/src/test/java/controllers/MainControllerTest.java b/src/test/java/controllers/MainControllerTest.java
new file mode 100644
index 0000000..ea163bb
--- /dev/null
+++ b/src/test/java/controllers/MainControllerTest.java
@@ -0,0 +1,24 @@
+package controllers;/**
+ * Created by Gondr on 5/04/2017.
+ */
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class MainControllerTest {
+
+    @Test
+    public void testLogin(){
+        //Tests if login is behaving properly
+        MainController controller = new MainController();
+        String user1 = "fwy13";
+        String pass1 = "fwy13";
+        assertTrue(controller.validateLogin(user1, pass1));
+
+        String user2 = "fwy13";
+        String pass2 = "79984862";
+        assertTrue(!controller.validateLogin(user2, pass2));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/model/DataManagerTest.java b/src/test/java/model/DataManagerTest.java
index 7235d6f..a53653d 100644
--- a/src/test/java/model/DataManagerTest.java
+++ b/src/test/java/model/DataManagerTest.java
@@ -13,6 +13,14 @@ public class DataManagerTest {
         DataManager dataManager = new DataManager();
         Ride ride = new Ride("Nissan March", "Blue", "HB9999", 2008, 4);
         dataManager.addRides(ride);
+        assertTrue(dataManager.getRides().get(0) == ride);
+
+        dataManager.removeRide(0);
+        assertTrue(dataManager.getRides().size() == 0);
+
+        dataManager.addRides(ride);
+        dataManager.removeRide(ride);
+        assertTrue(dataManager.getRides().size() == 0);
     }
 
 }
\ No newline at end of file
diff --git a/target/classes/controllers/MainController.class b/target/classes/controllers/MainController.class
index 6450b7f..ba4bd8a 100644
Binary files a/target/classes/controllers/MainController.class and b/target/classes/controllers/MainController.class differ
diff --git a/target/classes/model/DataManager.class b/target/classes/model/DataManager.class
index 8578b97..0ad6ffd 100644
Binary files a/target/classes/model/DataManager.class and b/target/classes/model/DataManager.class differ
diff --git a/target/test-classes/controllers/MainControllerTest.class b/target/test-classes/controllers/MainControllerTest.class
new file mode 100644
index 0000000..4d8d80a
Binary files /dev/null and b/target/test-classes/controllers/MainControllerTest.class differ
diff --git a/target/test-classes/model/DataManagerTest.class b/target/test-classes/model/DataManagerTest.class
index 6be0971..81e07de 100644
Binary files a/target/test-classes/model/DataManagerTest.class and b/target/test-classes/model/DataManagerTest.class differ