PAN-15 Merged with master

build.gradle

@@ -1,4 +1,3 @@
-
 buildscript {
     repositories {
         mavenCentral()

services/src/integrationTest/java/edu/msudenver/tsp/services/UserServiceIntegrationTest.java

@@ -49,6 +49,7 @@ public class UserServiceIntegrationTest {
 
         assertTrue(result);
     }
+
     private Account creatAccount(){
         final Account testAccount = new Account();
         testAccount.setUsername("test user");

services/src/test/java/edu/msudenver/tsp/services/UserServiceTest.java

@@ -19,10 +19,8 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class UserServiceTest {
-    @Mock
+    @Mock private RestService restService;
-    private RestService restService;
+    @InjectMocks private UserService userService;
-    @InjectMocks
-    private UserService userService;
 
     @Test
     public void testCreateNewAccount() throws ParseException {