Fix 2018 tests
@ngrieser Fixes tests from !1726 (merged) . Note this is to merge into that branch to keep the diff manageable.
I merged in the last linting commit so this looks more extensive than it is. The pertinent changes are:
Edited by Mark Smith