simplify current user
added tests for helper