Merge "create a non-admin token validation test"