More Userstream test and cleanup