diff --git a/src/main/java/application/controllers/UserController.java b/src/main/java/application/controllers/UserController.java
index 8852d36..0fdfeb8 100644
--- a/src/main/java/application/controllers/UserController.java
+++ b/src/main/java/application/controllers/UserController.java
@@ -30,6 +30,14 @@ public class UserController {
     @Autowired
     private RoleRepository roleRepository;
 
+    public void setUserRepository(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
+    public void setRoleRepository(RoleRepository roleRepository) {
+        this.roleRepository = roleRepository;
+    }
+
     @PersistenceContext
     private EntityManager entityManager;
 
diff --git a/src/main/java/application/model/Message.java b/src/main/java/application/model/Message.java
index 90f9ebd..7a1f450 100644
--- a/src/main/java/application/model/Message.java
+++ b/src/main/java/application/model/Message.java
@@ -26,12 +26,15 @@ public class Message {
     @Basic
     public String message;
 
+
     public Message(String message) {
         this.message = message;
         isRead=false;
         dateTime=new Date().toString();
     }
 
+
+
     public String getMessage() {
         return message;
     }
@@ -61,7 +64,7 @@ public class Message {
         return messageId;
     }
 
-    public void setMessageId(Long messageId) {
+    public void setMessageId(long messageId) {
         this.messageId = messageId;
     }
 }
diff --git a/src/main/java/test/UserControllerTest.java b/src/main/java/test/UserControllerTest.java
index ca20b24..b55d92a 100644
--- a/src/main/java/test/UserControllerTest.java
+++ b/src/main/java/test/UserControllerTest.java
@@ -1,7 +1,76 @@
 package test;
 
+import application.controllers.UserController;
+import application.model.Message;
+import application.model.User;
+import application.repositories.UserRepository;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Test;
+
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 /**
  * Created by lukasgol on 19.01.15.
  */
 public class UserControllerTest {
+    @Test
+        public void loginTest() throws JSONException {
+            UserController userController = new UserController();
+            String login = "aaa";
+            String password = "bbb";
+            String registrationId = "0";
+            String expectedUserList = "{\"success\":true,\"registrationId\":\""+registrationId+"\",\"accessCodes\":[],\"messages\":[]}";
+            User user = new User("aaa", "bbb", login, password);
+            List<User> userList = asList(new User("a", "a", "a", "a"), user);
+            UserRepository userRepository = mock(UserRepository.class);
+            when(userRepository.findAll()).thenReturn(userList);
+            userController.setUserRepository(userRepository);
+            String result = userController.login(login, password, registrationId);
+            assertEquals(expectedUserList, result.toString());
+        }
+
+    @Test
+    public void addTest() throws JSONException {
+            UserController userController = new UserController();
+            String login = "aaa";
+            String password = "bbb";
+            String registrationId = "0";
+            User user = new User("aaa", "bbb", login, password);
+            String expectedUserList = "saved user: "+user.getUserId();
+            UserRepository userRepository = mock(UserRepository.class);
+            when(userRepository.save(user)).thenReturn(user);
+            userController.setUserRepository(userRepository);
+            String result = userController.addUser(user);
+            assertEquals(expectedUserList, result.toString());
+        }
+
+    @Test
+    public void markMessageAsReadTest() throws JSONException {
+        UserController userController = new UserController();
+        String login = "aaa";
+        String password = "bbb";
+        String registrationId = "0";
+        long userId=0;
+        String expectedUserList = new JSONObject().put("success", true).toString();
+        User user = new User("aaa", "bbb", login, password);
+        Message m1 = new Message("hello");
+        m1.setMessageId(0);
+        user.addMessage(m1);
+        Message m2= new Message("You're fired");
+        m2.setMessageId(1);
+        user.addMessage(m2);
+        UserRepository userRepository = mock(UserRepository.class);
+        when(userRepository.findOne(userId)).thenReturn(user);
+        when(userRepository.save(user)).thenReturn(user);
+        userController.setUserRepository(userRepository);
+        String result = userController.markMessageAsRead(0,1);
+        assertEquals(expectedUserList, result.toString());
+    }
 }
+