Revert "Resolve merge conflicts."

This reverts commit 4a0644f3cd4a021fc01a59cd489ce63ac6cebbd4, reversing
changes made to f8d521999cc797eaae494c7d3603a33643f393de.
Revert "skip test that will fail if user is non-admin"

This reverts commit f8d521999cc797eaae494c7d3603a33643f393de.
Revert "skip test that will fail if current user is non-admin"

This reverts commit be0e5b51cd44df2fb5273f9bb7fb2c43223d526f.
Revert "skip test that will fail if user it non-admin"

This reverts commit f10c45b1f8d70f7c0ad62e11e4311b543a1aacf9.