Fix tests. One apparent failure was because of a print statement to cout, the other was failing on cleaning up a temporary file so we'll do without that for the time being. Re #1384.