diff --git a/e2e/testRigor/rules/create-admin-user.txt b/e2e/testRigor/rules/create-admin-user.txt
index c5369fa2d..a3f83226d 100644
--- a/e2e/testRigor/rules/create-admin-user.txt
+++ b/e2e/testRigor/rules/create-admin-user.txt
@@ -1,12 +1,12 @@
 click "Create User"
 generate unique name, then enter into "First Name" and save as "firstName"
 generate unique name, then enter into "Last Name" and save as "lastName"
-generate unique name, then enter into "Username" and save as "username"
+generate unique name, then enter into "Username" and save as "newAdminUsername"
 generate unique email, then enter into "Email" and save as "email"
 click "Send password to email address"
-save value "Mifos!123" as "password"
-enter stored value "password" into "Password"
-enter stored value "password" into "Repeat Password"
+generate from template "#%$\$*********" and save as "newAdminPassword"
+enter stored value "newAdminPassword" into "Password"
+enter stored value "newAdminPassword" into "Repeat Password"
 click "Office"
 click "Head Office"
 click "Roles"
diff --git a/e2e/testRigor/rules/delete-admin-user.txt b/e2e/testRigor/rules/delete-admin-user.txt
new file mode 100644
index 000000000..cc86d013b
--- /dev/null
+++ b/e2e/testRigor/rules/delete-admin-user.txt
@@ -0,0 +1,8 @@
+navigate-to-admin-users-management
+enter saved value "firstName" into "Filter"
+click saved value "firstName" below saved value "firstName"
+click button "Delete"
+click button "Confirm"
+navigate-to-admin-users-management
+enter saved value "firstName" into "Filter"
+validate that page doesn't contain saved value "firstName" below saved value "firstName"
diff --git a/e2e/testRigor/rules/delete-client.txt b/e2e/testRigor/rules/delete-client.txt
new file mode 100644
index 000000000..9fecda4d9
--- /dev/null
+++ b/e2e/testRigor/rules/delete-client.txt
@@ -0,0 +1,10 @@
+navigate-to-clients
+enter saved value "firstName" into "Search"
+click saved value "firstName" below saved value "firstName"
+click "Client actions"
+click "Actions"
+click "Delete"
+click "Confirm"
+navigate-to-clients
+enter saved value "firstName" into "Search"
+validate that page doesn't contain saved value "firstName"
diff --git a/e2e/testRigor/rules/log-in-and-validate.txt b/e2e/testRigor/rules/log-in-and-validate.txt
index 00c649b4f..bea5c9b94 100644
--- a/e2e/testRigor/rules/log-in-and-validate.txt
+++ b/e2e/testRigor/rules/log-in-and-validate.txt
@@ -1,5 +1,5 @@
-enter saved value "username" into field "Username"
-enter saved value "password" into field "Password"
-click exactly "Login"
+wait 1 sec up to 10 times until page contains field "Username"
+check that page contains field "Password"
+login
 close-popup
 check that page contains string with parameters "Welcome, ${username}!"
diff --git a/e2e/testRigor/testcases/create-admin-user.txt b/e2e/testRigor/testcases/create-admin-user.txt
index 11bee6ca0..3d5141224 100644
--- a/e2e/testRigor/testcases/create-admin-user.txt
+++ b/e2e/testRigor/testcases/create-admin-user.txt
@@ -1,7 +1,7 @@
 log-in-and-validate
 navigate-to-admin-users-management
 create-admin-user
-check that page contains saved value "username" on the right of "Login Name"
+check that page contains saved value "newAdminUsername" on the right of "Login Name"
 check that page contains saved value "firstName" on the right of "First Name"
 check that page contains saved value "lastName" on the right of "Last Name"
 check that page contains saved value "email" on the right of "Email"
@@ -13,4 +13,14 @@ check that page contains saved value "lastName" below saved value "firstName"
 check that page contains saved value "email" below saved value "firstName"
 //validate login new admin profile
 logout
+validate-login-page
+enter saved value "newAdminUsername" into "Username"
+enter saved value "newAdminPassword" into "Password"
+click "Login"
+close-popup
+check that page contains string with parameters "Welcome, ${newAdminUsername}!"
+logout
+// clean up
+validate-login-page
 log-in-and-validate
+delete-admin-user
diff --git a/e2e/testRigor/testcases/create-client.txt b/e2e/testRigor/testcases/create-client.txt
index dd5fbaa22..751feb3ad 100644
--- a/e2e/testRigor/testcases/create-client.txt
+++ b/e2e/testRigor/testcases/create-client.txt
@@ -11,11 +11,12 @@ click "Submit"
 //validate in profile
 check that page contains saved value "firstName" on the right of "Client Name :"
 check that page contains saved value "lastName" on the right of "Client Name :"
-check that page contains saved value "externalID" on the right of "External Id:"
+check that page contains saved value "externalID" on the right of "External Id"
 //validade in clients list
 click "Clients"
 enter saved value "firstName" into "Search"
 enter enter
 check that page contains saved value "firstName" below saved value "firstName"
 check that page contains saved value "lastName" below saved value "firstName"
-check that page contains saved value "externalID" onthe right of saved value "lastName"
+check that page contains saved value "externalID" on the right of saved value "lastName"
+delete-client
diff --git a/e2e/testRigor/testcases/edit-organization.txt b/e2e/testRigor/testcases/edit-organization.txt
new file mode 100644
index 000000000..ebb1c2fef
--- /dev/null
+++ b/e2e/testRigor/testcases/edit-organization.txt
@@ -0,0 +1,17 @@
+log-in-and-validate
+navigate-to-offices
+create-organization
+//edit  an organization
+enter saved value "officeName" into "Filter"
+click 2nd saved value "officeName"
+click "Edit"
+double click field "Office"
+enter delete
+generate unique name, then enter into field "Office" and save as "newOfficeName"
+click "Submit"
+check that page contains "General"
+check that page contains saved value "newOfficeName"
+//validate edited organization
+click "Manage Offices"
+enter saved value "newOfficeName" into "Filter"
+check that page contains saved value "newOfficeName" below saved value "newOfficeName"
diff --git a/e2e/testRigor/testcases/invalid-login.txt b/e2e/testRigor/testcases/invalid-login.txt
index 6114569d6..ec4991adc 100644
--- a/e2e/testRigor/testcases/invalid-login.txt
+++ b/e2e/testRigor/testcases/invalid-login.txt
@@ -1,8 +1,6 @@
 // Setting wrong credentials
 save value "wrong" as "username"
-save value "wrong" as "password"
-enter saved value "username" into field "Username"
-enter saved value "password" into field "Password"
-click exactly "Login"
+save value "wrongpassword" as "password"
+login
 // validate invalid login message
 check that page contains "Invalid User Details. Please try again!"