Remove unsupported grant type and fix tests