Adding User test case, and tweaking API