Test fixes / enotice compliance

top 3 files are non tests so bear eyeballing - rest should 'test themselves'

@totten with this PR the ONLY unit tests that are not e-Notice compliant are the extensions ones - which I don't really understand well enough to fix :-(

NB probably worth merging to master because I hate thinking about all the effort people are putting into fixing unit tests on master that are now fixed in 4.4....