Update tests with new grant types
Update /token to use new grant types
Refactor /token using async