LPS-40050 Fix user stats + Tests