Adding more msgs, checking admin/non-admin endpoints

Change-Id: I0100b5f68fac663035366a348651a31ba09f1470
Merge "Adding more msgs, checking admin/non-admin endpoints"