Unfudge/Normalize Supply.merge tests