JOJ16: is restricted to admin flag added and tests fixed