Make users test a little more robust