diff --git a/client/src/app-components/ticket-event.js b/client/src/app-components/ticket-event.js
index a42b3e28..db08ac30 100644
--- a/client/src/app-components/ticket-event.js
+++ b/client/src/app-components/ticket-event.js
@@ -7,7 +7,6 @@ import API from 'lib-app/api-call';
 import DateTransformer from 'lib-core/date-transformer';
 import Icon from 'core-components/icon';
 import Tooltip from 'core-components/tooltip';
-import TextEditor from 'core-components/text-editor';
 import Button from 'core-components/button';
 import SubmitButton from 'core-components/submit-button';
 import Form from 'core-components/form';
diff --git a/client/src/app-components/ticket-event.scss b/client/src/app-components/ticket-event.scss
index 9af606b1..dd5037e0 100644
--- a/client/src/app-components/ticket-event.scss
+++ b/client/src/app-components/ticket-event.scss
@@ -97,6 +97,7 @@
             padding: 28px 10px;
             text-align: left;
             position:relative;
+            overflow-y: initial;
 
             &:hover {
                 .ticket-event__comment-content__edit {
diff --git a/client/src/core-components/file-uploader.js b/client/src/core-components/file-uploader.js
index 8c5277e8..f01a85de 100644
--- a/client/src/core-components/file-uploader.js
+++ b/client/src/core-components/file-uploader.js
@@ -31,6 +31,7 @@ class FileUploader extends React.Component {
     getMimeTypes() {
         return `
             image/png,
+            image/gif,
             image/jpeg,
             image/bmp,
             image/tiff,
diff --git a/client/src/lib-app/__tests__/session-store-test.js b/client/src/lib-app/__tests__/session-store-test.js
index 40f51a62..d7f13156 100644
--- a/client/src/lib-app/__tests__/session-store-test.js
+++ b/client/src/lib-app/__tests__/session-store-test.js
@@ -49,10 +49,16 @@ describe('sessionStore library', function () {
     });
 
     it('should inform if it is logged in', function () {
-        LocalStorageMock.getItem = stub().returns('TOKEN');
+        LocalStorageMock.getItem = function (key) {
+          if (key == `${root}_userId`) return 'USER_ID';
+          if (key == `${root}_ticketNumber`) return '';
+        };
         expect(sessionStore.isLoggedIn()).to.equal(true);
 
-        LocalStorageMock.getItem = stub().returns(null);
+        LocalStorageMock.getItem = function (key) {
+          if (key == 'userId') return 'USER_ID';
+          if (key == 'ticketNumber') return 'TICKET_NUMBER';
+        };
         expect(sessionStore.isLoggedIn()).to.equal(false);
     });
 
diff --git a/server/Makefile b/server/Makefile
index 85280df9..79b1d16c 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -7,9 +7,9 @@ build:
 	@docker pull phpmyadmin/phpmyadmin
 	@docker pull munkyboy/fakesmtp
 	@docker build -t opensupports-srv . || echo "A${red}An error occurred${reset}"
+	@docker network create os-net || true
 
 install:
-	@docker network create os-net || true
 	@docker exec -it opensupports-srv bash -c "cd /var/www/html && composer install" || echo "${red}Please execute 'make run' first${reset}"
 	@docker exec -it opensupports-db bash -c "mysql -u root -e \"CREATE DATABASE IF NOT EXISTS development;\" " || echo "${red}Please execute 'make run' first${reset}"
 
@@ -20,7 +20,7 @@ run: stop
 	@docker run -d --network os-net --name opensupports-srv -p 8080:80 --link opensupports-db:mysql --rm -e LOG_STDOUT=true -e LOG_STDERR=true -e LOG_LEVEL=debug -v ${PWD}:/var/www/html opensupports-srv
 
 test:
-	@./run-tests.sh
+	@docker exec -it opensupports-srv bash -c "cd /var/www/html && ./run-tests.sh"
 
 log:
 	@docker attach opensupports-srv || echo "${red}Please execute 'make run' first${reset}"
diff --git a/server/libs/FileUploader.php b/server/libs/FileUploader.php
index e93a031a..2686fe4b 100755
--- a/server/libs/FileUploader.php
+++ b/server/libs/FileUploader.php
@@ -23,6 +23,7 @@ class FileUploader extends FileManager {
         $file->addValidations(array(
             new \Upload\Validation\Mimetype([
                 'image/png',
+                'image/gif',
                 'image/jpeg',
                 'image/bmp',
                 'image/tiff',
diff --git a/server/tests/controllers/user/loginTest.php b/server/tests/controllers/user/loginTest.php
index d9615ff3..48081bce 100755
--- a/server/tests/controllers/user/loginTest.php
+++ b/server/tests/controllers/user/loginTest.php
@@ -25,14 +25,6 @@ class LoginControllerTest extends TestCase {
         $this->loginController = new LoginController();
     }
 
-    public function testShouldRespondErrorIfAlreadyLoggedIn() {
-        Session::mockInstanceFunction('sessionExists', \Mock::stub()->returns(true));
-
-        $this->expectExceptionMessage(ERRORS::SESSION_EXISTS);
-
-        $this->loginController->handler();
-    }
-
     public function testShouldCreateSessionAndRespondSuccessIfCredentialsAreValid() {
         Session::mockInstanceFunction('sessionExists', \Mock::stub()->returns(false));
         Controller::useValueReturn();