diff --git a/utilities/acceptance-tests/suites/user-privileges/CheckUserBasedPrivileges.html b/utilities/acceptance-tests/suites/user-privileges/CheckUserBasedPrivileges.html
deleted file mode 100644
index 8ce7b805..00000000
--- a/utilities/acceptance-tests/suites/user-privileges/CheckUserBasedPrivileges.html
+++ /dev/null
@@ -1,540 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<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>Check User Privileges</title>
-<style type="text/css">
-.testName {
-  color: blue;
-  background: rgb(80%, 80%, 80%);
-  font-family: sans-serif;
-  font-weight: bold;
-  font-size: larger;
-  text-align: center;
-}
-.comment {
-  color: blue;
-  background: rgb(80%, 80%, 80%);
-  font-family: sans-serif;
-  font-weight: bold;
-  font-size: larger;
-  text-align: center;
-}
-</style>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3" class="testName">Check User Privileges</td></tr>
-</thead><tbody>
-<tr>
-	<td>deleteAllVisibleCookies</td>
-	<td></td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">This tests if a User can be associated with an Individual and if the User can then do profile editing.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/vivo/siteAdmin?home=1&amp;login=block</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Log in</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>username</td>
-	<td>testAdmin</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>Password</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Class hierarchy</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">add a person to associate Joe User with.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Class Hierarchy</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=exact:foaf:Agent</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Class Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Add New Individual in This Class']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Individual Editing Form</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>Name</td>
-	<td>UserJoe</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>primaryAction</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Individual Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Add Type']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Individual Type Editing Form</td>
-	<td></td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>TypeURI</td>
-	<td>label=core:Faculty Member</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>primaryAction</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Individual Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">comment pause for class inference</td>
-	<td></td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>500</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Site Admin</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Associate Joe User and individual UserJoe.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=User accounts</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Accounts</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Joe User</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=add</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>objectVar</td>
-	<td>label=UserJoe</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>delete</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>User may edit as the following Individuals:</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>UserJoe</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Log out</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Log in as Joe User.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Log in</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>username</td>
-	<td>Joe User</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>firstTime</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>UserJoe</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=UserJoe</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>UserJoe</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Check if there are edit links.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=add</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>comment</td>
-	<td class="comment">Check that Joe User cannot edit other individuals.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Country</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Country</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Afghanistan</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Afghanistan</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>add</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Log out</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Clean up.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Log in</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>username</td>
-	<td>testAdmin</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>Password</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=User accounts</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Accounts</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Joe User</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=delete</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>delete</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Control Panel</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=UserJoe</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>UserJoe</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>clickAndWait</td>
-	<td>//input[@value='Edit This Individual']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Individual Editing Form</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>_delete</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertConfirmation</td>
-	<td>Are you SURE you want to delete this entity? If in doubt, CANCEL.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</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=Log out</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO</td>
-	<td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/utilities/acceptance-tests/suites/user-privileges/Suite.html b/utilities/acceptance-tests/suites/user-privileges/Suite.html
index ad4de28b..a14aa56a 100644
--- a/utilities/acceptance-tests/suites/user-privileges/Suite.html
+++ b/utilities/acceptance-tests/suites/user-privileges/Suite.html
@@ -11,7 +11,6 @@
 <tr><td><a href="CheckCuratorPrivileges.html">Check Curator Privileges</a></td></tr>
 <tr><td><a href="CheckEditorPrivileges.html">Check Editor Privileges</a></td></tr>
 <tr><td><a href="CheckNobodyPrivileges.html">Check Nobody Privileges</a></td></tr>
-<tr><td><a href="CheckUserBasedPrivileges.html">Check User Privileges</a></td></tr>
 </tbody></table>
 </body>
 </html>

Check User Privileges
deleteAllVisibleCookies
comment	This tests if a User can be associated with an Individual and if the User can then do profile editing.
open	/vivo/siteAdmin?home=1&login=block
assertTitle	VIVO Site Administration
clickAndWait	link=Log in
assertTitle	VIVO Site Administration
type	username	testAdmin
type	password	Password
clickAndWait	loginSubmitMode
assertTitle	VIVO Site Administration
clickAndWait	link=Class hierarchy
comment	add a person to associate Joe User with.
assertTitle	Class Hierarchy
clickAndWait	link=exact:foaf:Agent
assertTitle	Class Control Panel
clickAndWait	//input[@value='Add New Individual in This Class']
assertTitle	Individual Editing Form
type	Name	UserJoe
clickAndWait	primaryAction
assertTitle	Individual Control Panel
clickAndWait	//input[@value='Add Type']
assertTitle	Individual Type Editing Form
select	TypeURI	label=core:Faculty Member
clickAndWait	primaryAction
assertTitle	Individual Control Panel
comment	comment pause for class inference
pause	500
clickAndWait	link=Site Admin
assertTitle	VIVO Site Administration
comment	Associate Joe User and individual UserJoe.
clickAndWait	link=User accounts
assertTitle	User Accounts
clickAndWait	link=Joe User
assertTitle	User Account Control Panel
clickAndWait	link=add
assertTitle	Edit
select	objectVar	label=UserJoe
clickAndWait	submit
assertTitle	User Account Control Panel
verifyTextPresent	delete
verifyTextPresent	User may edit as the following Individuals:
verifyTextPresent	UserJoe
clickAndWait	link=Log out
assertTitle	VIVO
comment	Log in as Joe User.
clickAndWait	link=Log in
assertTitle	VIVO Site Administration
type	username	Joe User
type	password	firstTime
clickAndWait	loginSubmitMode
assertTitle	UserJoe
clickAndWait	link=Index
assertTitle	Index to VIVO Contents
clickAndWait	link=Faculty Member
assertTitle	Faculty Member
clickAndWait	link=UserJoe
assertTitle	UserJoe
comment	Check if there are edit links.
verifyElementPresent	link=add
clickAndWait	link=Index
assertTitle	Index to VIVO Contents
comment	Check that Joe User cannot edit other individuals.
clickAndWait	link=Country
assertTitle	Country
clickAndWait	link=Afghanistan
assertTitle	Afghanistan
assertTextNotPresent	add
clickAndWait	link=Log out
assertTitle	VIVO
comment	Clean up.
clickAndWait	link=Log in
assertTitle	VIVO Site Administration
type	username	testAdmin
type	password	Password
clickAndWait	loginSubmitMode
assertTitle	VIVO Site Administration
clickAndWait	link=User accounts
assertTitle	User Accounts
clickAndWait	link=Joe User
assertTitle	User Account Control Panel
clickAndWait	link=delete
assertTitle	Edit
clickAndWait	delete
assertTitle	User Account Control Panel
clickAndWait	link=Index
assertTitle	Index to VIVO Contents
clickAndWait	link=Faculty Member
assertTitle	Faculty Member
clickAndWait	link=UserJoe
assertTitle	UserJoe
clickAndWait	link=edit this individual
assertTitle	Individual Control Panel
clickAndWait	//input[@value='Edit This Individual']
assertTitle	Individual Editing Form
clickAndWait	_delete
assertConfirmation	Are you SURE you want to delete this entity? If in doubt, CANCEL.
assertTitle	VIVO Site Administration
clickAndWait	link=Index
assertTitle	Index to VIVO Contents
clickAndWait	link=Log out
assertTitle	VIVO