Fix failed tests after adding password grant support