Defend against hairline use; image test rebaseline