Make tests more explicit

Author: grantland

Parse/src/test/java/com/parse/ParseUserTest.java

@@ -218,6 +218,7 @@ public void testSignUpAsyncWithMergeInDiskAnonymousUser() throws Exception {
     ParseUser currentUser = mock(ParseUser.class);
     when(currentUser.getUsername()).thenReturn("oldUserName");
     when(currentUser.getPassword()).thenReturn("oldPassword");
+    when(currentUser.isLazy()).thenReturn(false);
     when(currentUser.isLinked(ParseAnonymousUtils.AUTH_TYPE)).thenReturn(true);
     when(currentUser.getSessionToken()).thenReturn("oldSessionToken");
     when(currentUser.getAuthData()).thenReturn(new HashMap<String, Map<String, String>>());
@@ -264,11 +265,11 @@ public void testSignUpAsyncWithMergeInDiskAnonymousUserSaveFailure() throws Exce
     Map<String, String> oldAnonymousAuthData = new HashMap<>();
     oldAnonymousAuthData.put("oldKey", "oldToken");
     currentUser.putAuthData(ParseAnonymousUtils.AUTH_TYPE, oldAnonymousAuthData);
-    ParseUser partialMockCurrentUser = spy(currentUser);
-    when(partialMockCurrentUser.getObjectId()).thenReturn("oldObjectId");
+    ParseUser partialMockCurrentUser = spy(currentUser); // Spy since we need mutex
     when(partialMockCurrentUser.getUsername()).thenReturn("oldUserName");
     when(partialMockCurrentUser.getPassword()).thenReturn("oldPassword");
     when(partialMockCurrentUser.getSessionToken()).thenReturn("oldSessionToken");
+    when(partialMockCurrentUser.isLazy()).thenReturn(false);
     ParseException saveException = new ParseException(ParseException.OTHER_CAUSE, "");
     doReturn(Task.<Void>forError(saveException))
         .when(partialMockCurrentUser)