repair visual tests to be able to round trip (undo bits that require 3.x support)