Fix test cases path
Make basic Uesr model
Fix GemFile conflict