Fix for available/supported grant types. Add validations and tests for them