Fixed bugs in current user. Test is not functional