r5651: A bit more code in userinfo test and hook up test function to