Complete Userstream with tests