* In merge tests, test for actual result equality. * Fix some minor errors to make AppVeyor happy.
* In merge tests, test for actual result equality.
* Fix some minor errors to make AppVeyor happy.

manpen/thrill,manpen/thrill,manpen/thrill,manpen/thrill,manpen/thrill