Fix (or forgive) a bunch of unit tests

I think after #200 and this, all the unit tests will pass or skip-on-failure (marked as @work_in_progress) so the automatic Travis build should start working :grinning: 

(May be neater to [fast-forward] merge #200 first, then rebase this onto that, then bring this in - but I don't think they conflict, so you can probably do whatever)