Clean up authorization manager and tests