cleaned xuser and added tests