Split off user helpers and add user search tests