Admin client, some porting of controller tests.