Make test case a bit more robust by setting both user Id and visitor id set refs #3490