I fixed the broken tests at e84c7ef148b5a5540096956209d8daf429e31c92.