Fix for existing tests #DOM-2