further test fixes

4 jobs for MR_issue67 in 21 minutes and 44 seconds (queued for 24 seconds)