Correct users_seen behavior and add tests