changing some naming from test to admin and some of the service code