Merge "cleanUp() removing all test resources as an admin"