Update gold, fix tests