Add user statistics and tests
small changes