Add some slow golden tests.  Dunno if they're right, but at least
they'll be consistent.
Merge remote-tracking branch 'origin/master'