diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html
index a7483798..ab931e53 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/ChangeLibrarianImage.html
@@ -4,7 +4,7 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
-<title>ChangeFacultyImage</title>
+<title>ChangeLibrarianImage</title>
 <style type="text/css">
 .testName {
   color: blue;
@@ -27,7 +27,7 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3" class="testName">ChangeFacultyImage</td></tr>
+<tr><td rowspan="1" colspan="3" class="testName">ChangeLibrarianImage</td></tr>
 </thead><tbody>
 <tr>
 	<td>deleteAllVisibleCookies</td>
@@ -36,7 +36,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Change the uploaded picture for Jane Faculty in the backend</td>
+	<td class="comment">Change the uploaded picture for Lily Librarian in the frontend</td>
 	<td></td>
 </tr>
 <tr>
@@ -106,52 +106,37 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Faculty Member</td>
+	<td>link=Librarian</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Faculty Member</td>
+	<td>Librarian</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Jane Faculty</td>
+	<td>link=Lily Librarian</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Lily Librarian</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyAttribute</td>
 	<td>//img[@title='click to view larger image']@src</td>
-	<td>/vivo/file/*/thumbnail_Jane1.jpg</td>
+	<td>/vivo/file/*/thumbnail_Lily1.jpg</td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Select to edit Jane Faculty's profile</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>//div[@id='content']/div[1]/h3</td>
+	<td class="comment">Select to edit Jane Faculty's image</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=edit this individual</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Individual Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Jane Faculty</td>
+	<td>//div[@id='dprop-vitro-image']/div/div/div/span/a[1]</td>
 	<td></td>
 </tr>
 <tr>
@@ -159,14 +144,9 @@
 	<td class="comment">Select to upload a new image but cancel out</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Upload Image']</td>
-	<td></td>
-</tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Replace image for Jane Faculty</td>
+	<td>Replace image for Lily Librarian</td>
 	<td></td>
 </tr>
 <tr>
@@ -187,7 +167,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg</td>
+	<td>C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Lily2.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -196,7 +176,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Crop Photo for Jane Faculty</td>
+	<td>Crop Photo for Lily Librarian</td>
 	<td></td>
 </tr>
 <tr>
@@ -206,22 +186,72 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Individual Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Jane Faculty</td>
+	<td>Lily Librarian</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Select file to upload again</td>
+	<td class="comment">Select to edit Jane Faculty's image</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value='Upload Image']</td>
+	<td>//div[@id='dprop-vitro-image']/div/div/div/span/a[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Select to upload a new image but cancel out</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Replace image for Lily Librarian</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Photo Upload</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Current Photo</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='photoUploadDefaultImageContainer']/img</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>datafile</td>
+	<td>C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Lily2.jpg</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//input[@value='Upload photo']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Crop Photo for Lily Librarian</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Select to edit Jane Faculty's image</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//div[@id='dprop-vitro-image']/div/div/div/span/a[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Select to upload a new image but cancel out</td>
 	<td></td>
 </tr>
 <tr>
@@ -247,7 +277,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg</td>
+	<td>C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Lily2.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -256,7 +286,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Crop Photo for Jane Faculty</td>
+	<td>Crop Photo for Lily Librarian</td>
 	<td></td>
 </tr>
 <tr>
@@ -286,7 +316,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Individual Control Panel</td>
+	<td>Lily Librarian</td>
 	<td></td>
 </tr>
 <tr>
@@ -294,40 +324,10 @@
 	<td class="comment">Verify image has been updated to new one</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Index</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Index to VIVO Contents</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Faculty Member</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Faculty Member</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Jane Faculty</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Jane Faculty</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyAttribute</td>
 	<td>//img[@title='click to view larger image']@src</td>
-	<td>/vivo/file/*/thumbnail_Jane2.jpg</td>
+	<td>/vivo/file/*/thumbnail_Lily2.jpg</td>
 </tr>
 <tr>
 	<td>comment</td>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html
index 4720d93c..664b8d06 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html
@@ -4,7 +4,7 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
-<title>ChangeFacultyImage</title>
+<title>DeleteFacultyImage</title>
 <style type="text/css">
 .testName {
   color: blue;
@@ -27,7 +27,7 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3" class="testName">ChangeFacultyImage</td></tr>
+<tr><td rowspan="1" colspan="3" class="testName">DeleteFacultyImage</td></tr>
 </thead><tbody>
 <tr>
 	<td>deleteAllVisibleCookies</td>
@@ -36,7 +36,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Change the uploaded picture for Jane Faculty in the backend</td>
+	<td class="comment">Delete the uploaded picture for Jane Faculty in the backend</td>
 	<td></td>
 </tr>
 <tr>
@@ -119,14 +119,24 @@
 	<td>link=Jane Faculty</td>
 	<td></td>
 </tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Verify picture does exist</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Jane Faculty</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyAttribute</td>
+	<td>//img[@title='click to view larger image']@src</td>
+	<td>/vivo/file/*/thumbnail_Jane2.jpg</td>
+</tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Select to edit Jane Faculty's profile</td>
+	<td class="comment">Select to edit Jane Faculty in the backend</td>
 	<td></td>
 </tr>
 <tr>
@@ -151,7 +161,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Select to upload an image to replace other one</td>
+	<td class="comment">Select to upload an image to be able to delete the picture</td>
 	<td></td>
 </tr>
 <tr>
@@ -179,54 +189,39 @@
 	<td>//div[@id='photoUploadDefaultImageContainer']/img</td>
 	<td></td>
 </tr>
-<tr>
-	<td>type</td>
-	<td>datafile</td>
-	<td>C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg</td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value='Upload photo']</td>
+	<td>link=Delete photo</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Crop Photo for Jane Faculty</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Cancel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Individual Control Panel</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Select file to upload</td>
+	<td class="comment">Verify image has been deleted</td>
 	<td></td>
 </tr>
-<tr>
-	<td>type</td>
-	<td>file1</td>
-	<td>C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg</td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submitMode</td>
+	<td>link=Index</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Upload Image</td>
+	<td>Index to VIVO Contents</td>
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>Results from processing input file:<br /> updated individual Jane Faculty<br />Link to check uploaded image:<br /> &lt;Jane2.html&gt;</td>
+	<td>clickAndWait</td>
+	<td>link=Faculty Member</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Faculty Member</td>
 	<td></td>
 </tr>
 <tr>
@@ -240,15 +235,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>comment</td>
-	<td class="comment">Verify image has been updated to new one</td>
+	<td>verifyElementPresent</td>
+	<td>//img[@title='no image']</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyAttribute</td>
-	<td>//img[@title='Jane Faculty']@src</td>
-	<td>/vivo/images/people/Jane2.jpg</td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Logout</td>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html
index 4720d93c..de0fe748 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html
@@ -4,7 +4,7 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
-<title>ChangeFacultyImage</title>
+<title>DeleteLibrarianImage</title>
 <style type="text/css">
 .testName {
   color: blue;
@@ -27,7 +27,7 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3" class="testName">ChangeFacultyImage</td></tr>
+<tr><td rowspan="1" colspan="3" class="testName">DeleteLibrarianImage</td></tr>
 </thead><tbody>
 <tr>
 	<td>deleteAllVisibleCookies</td>
@@ -36,7 +36,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Change the uploaded picture for Jane Faculty in the backend</td>
+	<td class="comment">Delete the uploaded picture for Lily Librarian in the frontend</td>
 	<td></td>
 </tr>
 <tr>
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Navigate to Jane Faculty</td>
+	<td class="comment">Navigate to Lily Librarian</td>
 	<td></td>
 </tr>
 <tr>
@@ -106,148 +106,48 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Faculty Member</td>
+	<td>link=Librarian</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Faculty Member</td>
+	<td>Librarian</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Jane Faculty</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>link=Lily Librarian</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Select to edit Jane Faculty's profile</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>//div[@id='content']/div[1]/h3</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=edit this individual</td>
+	<td class="comment">Verify picture does exist</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Individual Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Jane Faculty</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Select to upload an image to replace other one</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Upload Image']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Replace image for Jane Faculty</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Photo Upload</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Current Photo</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>//div[@id='photoUploadDefaultImageContainer']/img</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>datafile</td>
-	<td>C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Upload photo']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Crop Photo for Jane Faculty</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Cancel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Jane Faculty</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Select file to upload</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>file1</td>
-	<td>C:\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\Jane2.jpg</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>submitMode</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Upload Image</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Results from processing input file:<br /> updated individual Jane Faculty<br />Link to check uploaded image:<br /> &lt;Jane2.html&gt;</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Jane Faculty</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Jane Faculty</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Verify image has been updated to new one</td>
+	<td>Lily Library</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyAttribute</td>
-	<td>//img[@title='Jane Faculty']@src</td>
-	<td>/vivo/images/people/Jane2.jpg</td>
+	<td>//img[@title='click to view larger image']@src</td>
+	<td>/vivo/file/*/thumbnail_Lily2.jpg</td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Select to delete the picture</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link=delete</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//img[@title='no image']</td>
+	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html
index bf6deaf6..2fb4a31f 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/UploadLibrarianImage.html
@@ -36,7 +36,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Upload image for Jane Faculty in the frontend</td>
+	<td class="comment">Upload image for Lily Librarian in the frontend</td>
 	<td></td>
 </tr>
 <tr>
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Find Jane Faculty via Index</td>
+	<td class="comment">Find Lily Librarian via Index</td>
 	<td></td>
 </tr>
 <tr>
