Fixes the SecureAdminHandler issues.

There still seems to be some issues in the tests around CloudDescriptors.