Make AccessibleQueryTests DVI-independent.
Cleanup (sorry, accidentally in master)