Post Preview: Correctly DI UserTokenProviders

Also cleans up unit tests to be able to pass in a IServiceCollection to setup DI, also fixes samples