Minor admin test code clean up with protocol 30.0.0 only. Will continue
cleaning up.